From 3b8feb331a11989fdd82c2d8d18e576df98e8895 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 23 Apr 2018 15:39:21 -0400 Subject: call skcms_OptimizeForSpeed() I've guarded src and dst separately, so that we can land, rebaseline just the src change, and then later (when it does something), rebaseline optimizing dst separately. Small threshold tweak to keep a unit test passing. Change-Id: I57cc43c54b6065f58fa8f9448ea1d73fc42505f0 Reviewed-on: https://skia-review.googlesource.com/123181 Commit-Queue: Mike Klein Reviewed-by: Brian Osman --- tests/ImageTest.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/ImageTest.cpp') diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 73c0bf197c..679dc8add9 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -1126,10 +1126,6 @@ static sk_sp create_picture_image(sk_sp 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 srgb = SkColorSpace::MakeSRGB(); sk_sp image = GetResourceAsImage("images/mandrill_512_q075.jpg"); @@ -1177,6 +1173,9 @@ DEF_TEST(Image_makeColorSpace, r) { sk_sp 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)))); -- cgit v1.2.3