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 /gyp | |
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 'gyp')
-rw-r--r-- | gyp/images.gyp | 1 | ||||
-rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 0062f24f1d..18a18be7e1 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -71,6 +71,7 @@ '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkImageEncoder_argb.cpp', + '../src/images/SkImageGenerator.cpp', '../src/images/SkImageRef.cpp', '../src/images/SkImageRefPool.cpp', '../src/images/SkImageRefPool.h', diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index f2698988e2..52608e7dc3 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -17,6 +17,7 @@ 'SK_SUPPORT_LEGACY_ASIMAGEINFO', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE', + 'SK_SUPPORT_LEGACY_IMAGEGENERATORAPI', ], }, } |