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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/peekpixels.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp index 484e4e03b4..01a60c124f 100644 --- a/gm/peekpixels.cpp +++ b/gm/peekpixels.cpp @@ -46,8 +46,7 @@ protected: SkImageInfo info; size_t rowBytes; const void* addr = surfCanvas->peekPixels(&info, &rowBytes); - if (addr && bitmap.installPixels(info, const_cast<void*>(addr), - rowBytes, NULL, NULL)) { + if (addr && bitmap.installPixels(info, const_cast<void*>(addr), rowBytes)) { canvas->drawBitmap(bitmap, 0, 0, NULL); } } |