diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 15:57:20 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 15:57:20 +0000 |
| commit | 00f8d6c75d22ce8f95f932c5b101354b196fa0df (patch) | |
| tree | 7ff413f0df54836620b2ba58c524d62ce7d033ff /src/image | |
| parent | 2246e325b8710389d8f718843356e410f683dd25 (diff) | |
Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/304443003/)"
Fix is to add colortable param to installPixels()
This reverts commit 924205aaf2e0c3c65dda13e0eaccde3e7b2a5c40.
BUG=skia:
R=scroggo@google.com, reed@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/300263005
git-svn-id: http://skia.googlecode.com/svn/trunk@14958 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage_Raster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index 7a8091c8af..3be7d84b7f 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -94,8 +94,9 @@ SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes) { data->ref(); void* addr = const_cast<void*>(data->data()); + SkColorTable* ctable = NULL; - fBitmap.installPixels(info, addr, rowBytes, release_data, data); + fBitmap.installPixels(info, addr, rowBytes, ctable, release_data, data); fBitmap.setImmutable(); fBitmap.lockPixels(); } |