From 2ecdfc2a331ee38d4494377330721d93e9f77ced Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Wed, 8 Mar 2017 17:14:17 -0500 Subject: [PATCH] Use SkColorSpace::isSRGB() in place of pointer comparison Test: Refactor Change-Id: I26301339fb964c6feca8c92f058524f8b83156ff --- core/jni/android/graphics/BitmapFactory.cpp | 6 +----- core/jni/android/graphics/Graphics.cpp | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index c1bb69da31798..e64a57447e6b5 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -417,11 +417,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding // For wide gamut images, we will leave the color space on the SkBitmap. Otherwise, // use the default. SkImageInfo bitmapInfo = decodeInfo; - sk_sp srgb = - SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, - SkColorSpace::kSRGB_Gamut, - SkColorSpace::kNonLinearBlending_ColorSpaceFlag); - if (decodeInfo.colorSpace() == srgb.get()) { + if (decodeInfo.colorSpace() && decodeInfo.colorSpace()->isSRGB()) { bitmapInfo = bitmapInfo.makeColorSpace(GraphicsJNI::colorSpaceForType(decodeColorType)); } diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index 7c56c7bf4158f..e66587a9d8fe1 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -461,12 +461,7 @@ sk_sp GraphicsJNI::colorSpaceForType(SkColorType type) { } bool GraphicsJNI::isColorSpaceSRGB(SkColorSpace* colorSpace) { - return colorSpace == nullptr - || colorSpace == SkColorSpace::MakeSRGB().get() - || colorSpace == SkColorSpace::MakeRGB( - SkColorSpace::kSRGB_RenderTargetGamma, - SkColorSpace::kSRGB_Gamut, - SkColorSpace::kNonLinearBlending_ColorSpaceFlag).get(); + return colorSpace == nullptr || colorSpace->isSRGB(); } ///////////////////////////////////////////////////////////////////////////////