diff options
| author | android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> | 2023-06-30 19:05:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-30 19:05:45 +0000 |
| commit | e7be42e6b40cbc198ec602de02145e9fc4546241 (patch) | |
| tree | e2ad96b82fadbfef74b97812a19b0c2b0ae4e35f | |
| parent | 37bfc03650a6cd3dadf33607db5928ac1a17882c (diff) | |
| parent | 929d127dfb0238b9e0f5c4eb86d069e4d0dcd53e (diff) | |
| download | skia-e7be42e6b40cbc198ec602de02145e9fc4546241.tar.gz | |
RESTRICT AUTOMERGE Roll Skia from d64928640a1b to ae193d0cc7e3 (1 revision) am: 929d127dfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/23858210
Change-Id: I5ff89f13d874af5695ff6f99a81dd62b4ec829f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 = |