commit 086a427b0cee3862f25c492fc5082ff24105dc53
author Mike Reed <reed@google.com> Tue Jul 18 10:53:11 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 18 15:50:43 2017 +0000
tree 79d4311c12309e5bc34950a0131771d3cb8f6171
parent 918ad9d5f19efdbd57486b8f931f7af197896010

guard references to SkColorTable

Bug: skia:6828
Change-Id: I0c8c78e70b118f51cb59dc45675e4ddcd4776108
Reviewed-on: https://skia-review.googlesource.com/24260
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

src/image/SkImage_Gpu.cpp

diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index fa507fe..5dd7943 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -680,8 +680,7 @@
     SkAutoPixmapStorage pixmap;
     SkImageInfo info;
     size_t pixelSize = 0;
-    if (!isScaled && this->peekPixels(&pixmap) && !pixmap.ctable() &&
-        pixmap.info().colorType() == dstColorType) {
+    if (!isScaled && this->peekPixels(&pixmap) && pixmap.info().colorType() == dstColorType) {
         info = pixmap.info();
         pixelSize = SkAlign8(pixmap.getSafeSize());
         if (!dstColorSpace) {
@@ -723,7 +722,6 @@
                     return 0;
                 }
             }
-            SkASSERT(!decodePixmap.ctable());
 
             if (decodeInfo.colorType() != info.colorType()) {
                 pixmap.alloc(info);