diff options
| author |  Matt Sarett <msarett@google.com> | 2017-04-05 11:41:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-05 16:17:15 +0000 |
| commit | cb87423cffb22467033a9e4f932399fb970faab6 (patch) | |
| tree | c923cbbd1f368f83e506d377aee8622d77f66c10 /tests/ImageTest.cpp | |
| parent | 944feea3d345616d62750faba6875a35c8d6712b (diff) | |
Add SkImage::makeColorSpace() to public API
Gives Chrome the flexibility to xform and cache
SkImages before they reach the
SkColorSpaceXformCanvas.
Bug: skia:
Change-Id: I1f188f385b953b5a958c15578ea66deffb4dc6c5
Reviewed-on: https://skia-review.googlesource.com/11290
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 9916ed3e08..22004a07c6 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -1061,7 +1061,7 @@ DEF_TEST(Image_makeColorSpace, r) { *srgbBitmap.getAddr32(0, 0) = SkSwizzle_RGBA_to_PMColor(0xFF604020); srgbBitmap.setImmutable(); sk_sp<SkImage> srgbImage = SkImage::MakeFromBitmap(srgbBitmap); - sk_sp<SkImage> p3Image = as_IB(srgbImage)->makeColorSpace(p3); + sk_sp<SkImage> p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore); SkBitmap p3Bitmap; bool success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); @@ -1070,7 +1070,8 @@ DEF_TEST(Image_makeColorSpace, r) { REPORTER_ASSERT(r, almost_equal(0x40, SkGetPackedG32(*p3Bitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x5E, SkGetPackedB32(*p3Bitmap.getAddr32(0, 0)))); - sk_sp<SkImage> adobeImage = as_IB(srgbImage)->makeColorSpace(adobeGamut); + sk_sp<SkImage> adobeImage = srgbImage->makeColorSpace(adobeGamut, + SkTransferFunctionBehavior::kIgnore); SkBitmap adobeBitmap; success = adobeImage->asLegacyBitmap(&adobeBitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); @@ -1080,7 +1081,7 @@ DEF_TEST(Image_makeColorSpace, r) { REPORTER_ASSERT(r, almost_equal(0x4C, SkGetPackedB32(*adobeBitmap.getAddr32(0, 0)))); srgbImage = GetResourceAsImage("1x1.png"); - p3Image = as_IB(srgbImage)->makeColorSpace(p3); + p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore); success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); p3Bitmap.lockPixels(); |