stop using SkBitmap::Config

tools/skpdiff/SkCLImageDiffer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <cstring>
 
 #include "SkBitmap.h"
@@ skipping 69 matching lines @@
         SkDebugf("Kernel creation failed: %s\n", cl_error_to_string(kernelErr));
         return false;
     }
 
     return true;
 }
 
 bool SkCLImageDiffer::makeImage2D(SkBitmap* bitmap, cl_mem* image) const {
     cl_int imageErr;
     cl_image_format bitmapFormat;
-    switch (bitmap->config()) {
-        case SkBitmap::kA8_Config:
+    switch (bitmap->colorType()) {
+        case kAlpha_8_SkColorType:
             bitmapFormat.image_channel_order = CL_A;
             bitmapFormat.image_channel_data_type = CL_UNSIGNED_INT8;
             break;
-        case SkBitmap::kRGB_565_Config:
+        case kRGB_565_SkColorType:
             bitmapFormat.image_channel_order = CL_RGB;
             bitmapFormat.image_channel_data_type = CL_UNORM_SHORT_565;
             break;
-        case SkBitmap::kARGB_8888_Config:
+        case kN32_SkColorType:
             bitmapFormat.image_channel_order = CL_RGBA;
             bitmapFormat.image_channel_data_type = CL_UNSIGNED_INT8;
             break;
         default:
             SkDebugf("Image format is unsupported\n");
             return false;
     }
 
     // Upload the bitmap data to OpenCL
     bitmap->lockPixels();
     *image = clCreateImage2D(fContext, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR,
                              &bitmapFormat, bitmap->width(), bitmap->height(),
                              bitmap->rowBytes(), bitmap->getPixels(),
                              &imageErr);
     bitmap->unlockPixels();
 
     if (CL_SUCCESS != imageErr) {
         SkDebugf("Input image creation failed: %s\n", cl_error_to_string(imageErr));
         return false;
     }
 
     return true;
 }