hide Config in SkImageDecoder -- use SkColorType instead

gm/cmykjpeg.cpp

Index: gm/cmykjpeg.cpp
diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp
index b30fd4d315ff75b88aa4c7487a979ab43b1f55d0..2d0c275b8ded563001edaedef1c727cf6ed00c28 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);
         }
     }