aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/android
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-07-12 22:10:29 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-13 10:44:42 +0000
commit580501382fb1418fff7acc63680f3a9a6bf3938c (patch)
tree16a93a72852e282b1f520dcc947985e2190a45bf /src/android
parent4d41b8f2fdae21a6ed16fca6242d53e7c08349d0 (diff)
Guard to remove kIndex_8_SkColorType
Bug: skia:6828 Change-Id: Ia942a36abb18213184f8d436555a658270d97d47 Reviewed-on: https://skia-review.googlesource.com/22721 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/SkBitmapRegionCodec.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp
index c4e1ea124c..52774bcfa0 100644
--- a/src/android/SkBitmapRegionCodec.cpp
+++ b/src/android/SkBitmapRegionCodec.cpp
@@ -57,7 +57,9 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat
SkImageInfo decodeInfo = SkImageInfo::Make(scaledSize.width(), scaledSize.height(),
dstColorType, dstAlphaType, dstColorSpace);
+#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
SkASSERT(dstColorType != kIndex_8_SkColorType);
+#endif
// Initialize the destination bitmap
int scaledOutX = 0;