commit 00f8d6c75d22ce8f95f932c5b101354b196fa0df
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 29 15:57:20 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 29 15:57:20 2014 +0000
tree 7ff413f0df54836620b2ba58c524d62ce7d033ff
parent 2246e325b8710389d8f718843356e410f683dd25

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

samplecode/SampleHairline.cpp

diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 85ecc03..807a319 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -230,8 +230,7 @@
         bm.eraseColor(SK_ColorTRANSPARENT);
 
         bm2.installPixels(SkImageInfo::MakeN32Premul(WIDTH, HEIGHT),
-                          bm.getAddr32(MARGIN, MARGIN), bm.rowBytes(),
-                          NULL, NULL);
+                          bm.getAddr32(MARGIN, MARGIN), bm.rowBytes());
 
         SkCanvas c2(bm2);
         SkPaint paint;

samplecode/SampleXfermodesBlur.cpp

diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index bb9c272..fff4bed 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp
@@ -75,9 +75,8 @@
     const static int W = 64;
     const static int H = 64;
     XfermodesBlurView() {
-        fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType,
-                                            kPremul_SkAlphaType),
-                          gBG, 4, NULL, NULL);
+        fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, kPremul_SkAlphaType),
+                          gBG, 4);
     }
 
 protected: