stop using SkBitmap::Config

tools/picture_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 "picture_utils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 namespace sk_tools {
     void force_all_opaque(const SkBitmap& bitmap) {
         SkASSERT(NULL == bitmap.getTexture());
-        SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());
-        if (NULL != bitmap.getTexture() || SkBitmap::kARGB_8888_Config == bitmap.config()) {
+        SkASSERT(kN32_SkColorType == bitmap.colorType());
+        if (NULL != bitmap.getTexture() || kN32_SkColorType == bitmap.colorType()) {
             return;
         }
 
         SkAutoLockPixels lock(bitmap);
         for (int y = 0; y < bitmap.height(); y++) {
             for (int x = 0; x < bitmap.width(); x++) {
                 *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);
             }
         }
     }
@@ skipping 31 matching lines @@
         SkString fullPath = SkOSPath::SkPathJoin(partialPath.c_str(), baseName.c_str());
         if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {
             return true;
         } else {
             SkDebugf("Failed to write the bitmap to %s.\n", fullPath.c_str());
             return false;
         }
     }
 
 } // namespace sk_tools