aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkImageGenerator.cpp
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/core/SkImageGenerator.cpp
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/core/SkImageGenerator.cpp')
-rw-r--r--src/core/SkImageGenerator.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index ab7667426e..7ce944be58 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -16,9 +16,14 @@ SkImageGenerator::SkImageGenerator(const SkImageInfo& info, uint32_t uniqueID)
bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
const Options* opts) {
- if (kUnknown_SkColorType == info.colorType() || kIndex_8_SkColorType == info.colorType()) {
+ if (kUnknown_SkColorType == info.colorType()) {
return false;
}
+#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
+ if (kIndex_8_SkColorType == info.colorType()) {
+ return false;
+ }
+#endif
if (nullptr == pixels) {
return false;
}