diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-30 23:27:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-30 23:27:42 +0000 |
| commit | 1145116447a46710a65e3a5deabb7d7c752af5ea (patch) | |
| tree | e2ad96b82fadbfef74b97812a19b0c2b0ae4e35f | |
| parent | 9705e6bf75e14e26b4ec56da75000e47cf4da1b0 (diff) | |
| parent | de4dc2b6192f0b632ea7f37af0ab38fad7f82b90 (diff) | |
| download | skia-android14-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23858210'] into udc-release.android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: Ieda651631d867ec9ad5e96b82d54ce0b9e566374
| -rw-r--r-- | client_utils/android/BitmapRegionDecoder.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/client_utils/android/BitmapRegionDecoder.cpp b/client_utils/android/BitmapRegionDecoder.cpp index 110dc0fe23..c5262b886a 100644 --- a/client_utils/android/BitmapRegionDecoder.cpp +++ b/client_utils/android/BitmapRegionDecoder.cpp @@ -79,10 +79,6 @@ bool BitmapRegionDecoder::decodeRegion(SkBitmap* bitmap, BRDAllocator* allocator } SkISize scaledSize = fCodec->getSampledSubsetDimensions(sampleSize, subset); - if (fCodec->getInfo().colorType() == kGray_8_SkColorType) { - dstColorType = kGray_8_SkColorType; - } - // Create the image info for the decode SkAlphaType dstAlphaType = fCodec->computeOutputAlphaType(requireUnpremul); SkImageInfo decodeInfo = |