diff options
| author | 2019-01-31 20:29:28 +0000 | |
|---|---|---|
| committer | 2019-01-31 20:29:28 +0000 | |
| commit | 4a49d7ad9615aa8d6ca85e4c98c1be9f621b726e (patch) | |
| tree | 3375587b3989b30b6afb0512c2a38547477b8b04 | |
| parent | f731b558a61da96afab0222111cbaeb78db4b43f (diff) | |
| parent | a170a5a5c20aa97cb3da472139959c893bea91de (diff) | |
Merge "Remove code that does nothing"
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 7ef30f7ee786..79bfa17bdd04 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -360,13 +360,7 @@ static jobject doDecode(JNIEnv* env, std::unique_ptr<SkStreamRewindable> stream, const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(), decodeColorType, alphaType, decodeColorSpace); - // For wide gamut images, we will leave the color space on the SkBitmap. Otherwise, - // use the default. SkImageInfo bitmapInfo = decodeInfo; - if (decodeInfo.colorSpace() && decodeInfo.colorSpace()->isSRGB()) { - bitmapInfo = bitmapInfo.makeColorSpace(decodeInfo.refColorSpace()); - } - if (decodeColorType == kGray_8_SkColorType) { // The legacy implementation of BitmapFactory used kAlpha8 for // grayscale images (before kGray8 existed). While the codec |