hide Config in SkImageDecoder -- use SkColorType instead

gm/cmykjpeg.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
 
 namespace skiagm {
 
 /** Draw a CMYK encoded jpeg - libjpeg doesn't support CMYK->RGB
     conversion so this tests Skia's internal processing
 */
 class CMYKJpegGM : public GM {
 public:
     CMYKJpegGM() {}
 
 protected:
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
 
         // parameters to the "decode" call
         bool dither = false;
-        SkBitmap::Config prefConfig = SkBitmap::kARGB_8888_Config;
 
         SkString filename(INHERITED::gResourcePath);
         if (!filename.endsWith("/") && !filename.endsWith("\\")) {
             filename.append("/");
         }
 
         filename.append("CMYK.jpg");
 
         SkFILEStream stream(filename.c_str());
         if (!stream.isValid()) {
             SkDebugf("Could not find CMYK.jpg, please set --resourcePath correctly.\n");
             return;
         }
 
         SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
         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);
         }
     }
 
     virtual SkString onShortName() {
         return SkString("cmykjpeg");
     }
 
     virtual SkISize onISize() {
         return SkISize::Make(640, 480);
@@ skipping 10 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new CMYKJpegGM; }
 static GMRegistry reg(MyFactory);
 
 }