commit 672e7cf9c41b60ef298fe40c8fc0bbba9c2b5828
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 29 17:10:54 2014 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 29 17:10:54 2014 +0000
tree 790270f3879b4004696e03eb09b8a33968a03151
parent 37c772ae2d96dad9b6e430e9bb6450193a545021

fix bug in legacy code for SK_SUPPORT_LEGACY_IMAGEGENERATORAPI

git-svn-id: http://skia.googlecode.com/svn/trunk@14967 2bbb7eff-a529-9590-31e7-b0007b416f81

src/lazy/SkDiscardablePixelRef.cpp

diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp
index b0bbd27..53e9d1a 100644
--- a/src/lazy/SkDiscardablePixelRef.cpp
+++ b/src/lazy/SkDiscardablePixelRef.cpp
@@ -64,7 +64,11 @@
     SkPMColor colors[256];
     int colorCount = 0;
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
+    if (!fGenerator->getPixels(info, pixels, fRowBytes)) {
+#else
     if (!fGenerator->getPixels(info, pixels, fRowBytes, colors, &colorCount)) {
+#endif
         fDiscardableMemory->unlock();
         SkDELETE(fDiscardableMemory);
         fDiscardableMemory = NULL;