hide Config in SkImageDecoder -- use SkColorType instead

tools/render_pictures_main.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 "LazyDecodeBitmap.h"
 #include "CopyTilesRenderer.h"
 #include "SkBitmap.h"
@@ skipping 112 matching lines @@
     SkImageDecoder::Format format = SkImageDecoder::GetStreamFormat(&memStream);
     SkString name = SkStringPrintf("%s_%d%s", gInputFileName.c_str(), gImageNo++,
                                    get_suffix_from_format(format));
     SkString dir(FLAGS_writePath[0]);
     outPath = SkOSPath::SkPathJoin(dir.c_str(), name.c_str());
     SkFILEWStream fileStream(outPath.c_str());
     if (!(fileStream.isValid() && fileStream.write(buffer, size))) {
         SkDebugf("Failed to write encoded data to \"%s\"\n", outPath.c_str());
     }
     // Put in a dummy bitmap.
-    return SkImageDecoder::DecodeStream(&memStream, bitmap, SkBitmap::kNo_Config,
+    return SkImageDecoder::DecodeStream(&memStream, bitmap, kUnknown_SkColorType,
                                         SkImageDecoder::kDecodeBounds_Mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Called only by render_picture().
  */
 static bool render_picture_internal(const SkString& inputPath, const SkString* writePath,
                                     const SkString* mismatchPath,
@@ skipping 350 matching lines @@
         jsonSummary.writeToFile(FLAGS_writeJsonSummaryPath[0]);
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif