hide Config in SkImageDecoder -- use SkColorType instead

patch from issue 334613003

TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/334793002

6 files changed, 9 insertions, 22 deletions

diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp
index b30fd4d315..2d0c275b8d 100644
--- a/gm/cmykjpeg.cpp
+++ b/gm/cmykjpeg.cpp
@@ -24,7 +24,6 @@ protected:
 
         // parameters to the "decode" call
         bool dither = false;
-        SkBitmap::Config prefConfig = SkBitmap::kARGB_8888_Config;
 
         SkString filename(INHERITED::gResourcePath);
         if (!filename.endsWith("/") && !filename.endsWith("\\")) {
@@ -43,8 +42,7 @@ protected:
         if (codec) {
             stream.rewind();
             codec->setDitherImage(dither);
-            codec->decode(&stream, &fBitmap, prefConfig,
-                          SkImageDecoder::kDecodePixels_Mode);
+            codec->decode(&stream, &fBitmap, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
             SkDELETE(codec);
         }
     }
diff --git a/gm/copyTo4444.cpp b/gm/copyTo4444.cpp
index ed0c046fa9..76dc66ca7c 100644
--- a/gm/copyTo4444.cpp
+++ b/gm/copyTo4444.cpp
@@ -31,8 +31,7 @@ protected:
     virtual void onDraw(SkCanvas* canvas) {
         SkBitmap bm, bm4444;
         SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_512.png");
-        if (!SkImageDecoder::DecodeFile(filename.c_str(), &bm,
-                                        SkBitmap::kARGB_8888_Config,
+        if (!SkImageDecoder::DecodeFile(filename.c_str(), &bm, kN32_SkColorType,
                                         SkImageDecoder::kDecodePixels_Mode)) {
             SkDebugf("Could not decode the file. Did you forget to set the "
                      "resourcePath?\n");
diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp
index 00b1a4b587..d7b93072c8 100644
--- a/gm/downsamplebitmap.cpp
+++ b/gm/downsamplebitmap.cpp
@@ -183,8 +183,7 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM {
           }
           if (codec) {
               stream.rewind();
-              codec->decode(&stream, &fBM, SkBitmap::kARGB_8888_Config,
-                  SkImageDecoder::kDecodePixels_Mode);
+              codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
           } else {
               fBM.allocN32Pixels(1, 1);
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp
index c650902b4b..351fb2aaf7 100644
--- a/gm/filterbitmap.cpp
+++ b/gm/filterbitmap.cpp
@@ -204,8 +204,7 @@ class FilterBitmapImageGM: public FilterBitmapGM {
           }
           if (codec) {
               stream.rewind();
-              codec->decode(&stream, &fBM, SkBitmap::kARGB_8888_Config,
-                  SkImageDecoder::kDecodePixels_Mode);
+              codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
           } else {
               fBM.allocN32Pixels(1, 1);
diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp
index c03dfba293..4acb2c3a71 100644
--- a/gm/filterindiabox.cpp
+++ b/gm/filterindiabox.cpp
@@ -45,7 +45,6 @@ static void draw_row(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat,
 
 class FilterIndiaBoxGM : public skiagm::GM {
     void onOnceBeforeDraw() {
-
         this->makeBitmap();
 
         SkScalar cx = SkScalarHalf(fBM.width());
@@ -63,14 +62,11 @@ public:
     SkMatrix    fMatrix[2];
     SkString    fName;
 
-    FilterIndiaBoxGM()
-    {
+    FilterIndiaBoxGM() {
         this->setBGColor(0xFFDDDDDD);
     }
 
-    FilterIndiaBoxGM(const char filename[])
-      : fFilename(filename)
-    {
+    FilterIndiaBoxGM(const char filename[]) : fFilename(filename) {
         fName.printf("filterindiabox");
     }
 
@@ -88,7 +84,6 @@ protected:
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
-
         canvas->translate(10, 10);
         for (size_t i = 0; i < SK_ARRAY_COUNT(fMatrix); ++i) {
             SkSize size = computeSize(fBM, fMatrix[i]);
@@ -120,8 +115,7 @@ protected:
           }
           if (codec) {
               stream.rewind();
-              codec->decode(&stream, &fBM, SkBitmap::kARGB_8888_Config,
-                  SkImageDecoder::kDecodePixels_Mode);
+              codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
           } else {
               fBM.allocN32Pixels(1, 1);
diff --git a/gm/gm_expectations.cpp b/gm/gm_expectations.cpp
index d2d629e8d3..f0ccb3e378 100644
--- a/gm/gm_expectations.cpp
+++ b/gm/gm_expectations.cpp
@@ -207,10 +207,8 @@ namespace skiagm {
         SkString path = SkOSPath::SkPathJoin(fRootDir.c_str(), testName);
         SkBitmap referenceBitmap;
         bool decodedReferenceBitmap =
-            SkImageDecoder::DecodeFile(path.c_str(), &referenceBitmap,
-                                       SkBitmap::kARGB_8888_Config,
-                                       SkImageDecoder::kDecodePixels_Mode,
-                                       NULL);
+            SkImageDecoder::DecodeFile(path.c_str(), &referenceBitmap, kN32_SkColorType,
+                                       SkImageDecoder::kDecodePixels_Mode, NULL);
         if (decodedReferenceBitmap) {
             return Expectations(referenceBitmap);
         } else {