diff options
| -rw-r--r-- | src/core/SkColorSpaceXform_skcms.cpp | 8 | ||||
| -rw-r--r-- | tests/ImageTest.cpp | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/core/SkColorSpaceXform_skcms.cpp b/src/core/SkColorSpaceXform_skcms.cpp index 936f7e4dd5..eb9a552bed 100644 --- a/src/core/SkColorSpaceXform_skcms.cpp +++ b/src/core/SkColorSpaceXform_skcms.cpp @@ -19,14 +19,6 @@ public: , fDstProfile(dstProfile) , fPremulFormat(premulFormat) { skcms_EnsureUsableAsDestination(&fDstProfile, &skcms_sRGB_profile); - - #ifndef SK_DONT_OPTIMIZE_SRC_PROFILES_FOR_SPEED - skcms_OptimizeForSpeed(&fSrcProfile); - #endif - #ifndef SK_DONT_OPTIMIZE_DST_PROFILES_FOR_SPEED - // (This doesn't do anything yet, but we'd sure like it to.) - skcms_OptimizeForSpeed(&fDstProfile); - #endif } bool apply(ColorFormat, void*, ColorFormat, const void*, int, SkAlphaType) const override; diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 679dc8add9..73c0bf197c 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -1126,6 +1126,10 @@ static sk_sp<SkImage> create_picture_image(sk_sp<SkColorSpace> space) { nullptr, nullptr, SkImage::BitDepth::kU8, std::move(space)); }; +static inline bool almost_equal(int a, int b) { + return SkTAbs(a - b) <= 1; +} + DEF_TEST(Image_ColorSpace, r) { sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB(); sk_sp<SkImage> image = GetResourceAsImage("images/mandrill_512_q075.jpg"); @@ -1173,9 +1177,6 @@ DEF_TEST(Image_makeColorSpace, r) { sk_sp<SkImage> p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore); SkBitmap p3Bitmap; bool success = p3Image->asLegacyBitmap(&p3Bitmap); - - auto almost_equal = [](int a, int b) { return SkTAbs(a - b) <= 2; }; - REPORTER_ASSERT(r, success); REPORTER_ASSERT(r, almost_equal(0x28, SkGetPackedR32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x40, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0)))); |