hide Config in SkImageDecoder -- use SkColorType instead

tools/skdiff_utils.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 "skdiff.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
 #include "SkData.h"
@@ skipping 45 matching lines @@
         SkDebugf("ERROR: no codec found for <%s>\n", resource.fFullPath.c_str());
         resource.fStatus = DiffResource::kCouldNotDecode_Status;
         return false;
     }
 
     // In debug, the DLL will automatically be unloaded when this is deleted,
     // but that shouldn't be a problem in release mode.
     SkAutoTDelete<SkImageDecoder> ad(codec);
 
     stream.rewind();
-    if (!codec->decode(&stream, &resource.fBitmap, SkBitmap::kARGB_8888_Config, mode)) {
+    if (!codec->decode(&stream, &resource.fBitmap, kN32_SkColorType, mode)) {
         SkDebugf("ERROR: codec failed for basePath <%s>\n", resource.fFullPath.c_str());
         resource.fStatus = DiffResource::kCouldNotDecode_Status;
         return false;
     }
 
     resource.fStatus = DiffResource::kDecoded_Status;
     return true;
 }
 
 /** Thanks to PNG, we need to force all pixels 100% opaque. */
@@ skipping 98 matching lines @@
                 drp->fDifference.fStatus = DiffResource::kDoesNotExist_Status;
             }
             if (write_bitmap(drp->fWhite.fFullPath, drp->fWhite.fBitmap)) {
                 drp->fWhite.fStatus = DiffResource::kExists_Status;
             } else {
                 drp->fWhite.fStatus = DiffResource::kDoesNotExist_Status;
             }
         }
     }
 }