diff options
| author |  Mike Reed <reed@google.com> | 2017-07-18 10:53:11 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-18 15:50:43 +0000 |
| commit | 086a427b0cee3862f25c492fc5082ff24105dc53 (patch) | |
| tree | 79d4311c12309e5bc34950a0131771d3cb8f6171 /src/image/SkImage_Gpu.cpp | |
| parent | 918ad9d5f19efdbd57486b8f931f7af197896010 (diff) | |
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>
Diffstat (limited to 'src/image/SkImage_Gpu.cpp')
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index fa507fe4af..5dd7943211 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -680,8 +680,7 @@ size_t SkImage::getDeferredTextureImageData(const GrContextThreadSafeProxy& prox 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 @@ size_t SkImage::getDeferredTextureImageData(const GrContextThreadSafeProxy& prox return 0; } } - SkASSERT(!decodePixmap.ctable()); if (decodeInfo.colorType() != info.colorType()) { pixmap.alloc(info); |