From 1bfcf887553a9d39b25f0d8c408b78841cd9d8fc Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Mon, 19 Dec 2016 18:37:34 -0500 Subject: Implement SkICC::WriteICC() BUG=skia: Change-Id: Idd950c3da2c517780b24e312a4e7cc16ee413c99 Reviewed-on: https://skia-review.googlesource.com/6270 Reviewed-by: Brian Osman Commit-Queue: Matt Sarett --- tests/ColorSpaceTest.cpp | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'tests/ColorSpaceTest.cpp') diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index 070d50264f..df253c09e3 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -142,43 +142,6 @@ DEF_TEST(ColorSpaceSRGBLinearCompare, r) { REPORTER_ASSERT(r, strangeColorSpace != namedColorSpace); } -class ColorSpaceTest { -public: - static sk_sp WriteToICC(SkColorSpace* space) { - return as_CSB(space)->writeToICC(); - } -}; - -DEF_TEST(ColorSpaceWriteICC, r) { - // Test writing a new ICC profile - sk_sp namedColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); - sk_sp namedData = ColorSpaceTest::WriteToICC(namedColorSpace.get()); - sk_sp iccColorSpace = SkColorSpace::MakeICC(namedData->data(), namedData->size()); - test_space(r, iccColorSpace.get(), g_sRGB_R, g_sRGB_G, g_sRGB_B, k2Dot2Curve_SkGammaNamed); - // FIXME (msarett): Test disabled. sRGB profiles are written approximately as 2.2f curves. - // REPORTER_ASSERT(r, iccColorSpace == namedColorSpace); - - // Test saving the original ICC data - sk_sp monitorData = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); - REPORTER_ASSERT(r, monitorData); - if (!monitorData) { - return; - } - sk_sp monitorSpace = SkColorSpace::MakeICC(monitorData->data(), - monitorData->size()); - sk_sp newMonitorData = ColorSpaceTest::WriteToICC(monitorSpace.get()); - sk_sp newMonitorSpace = SkColorSpace::MakeICC(newMonitorData->data(), - newMonitorData->size()); - SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(monitorSpace)->type()); - SkColorSpace_XYZ* monitorSpaceXYZ = static_cast(monitorSpace.get()); - SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(newMonitorSpace)->type()); - SkColorSpace_XYZ* newMonitorSpaceXYZ = static_cast(newMonitorSpace.get()); - REPORTER_ASSERT(r, *monitorSpaceXYZ->toXYZD50() == *newMonitorSpaceXYZ->toXYZD50()); - REPORTER_ASSERT(r, monitorSpaceXYZ->toXYZD50Hash() == newMonitorSpaceXYZ->toXYZD50Hash()); - REPORTER_ASSERT(r, monitorSpaceXYZ->gammaNamed() == newMonitorSpaceXYZ->gammaNamed()); -} - DEF_TEST(ColorSpace_Named, r) { const struct { SkColorSpace::Named fNamed; -- cgit v1.2.3