commit 0689d7b12e7c427a077b003d3d8ae759d86f798f
author reed <reed@chromium.org> Sat Jun 14 05:30:20 2014 -0700
committer Commit bot <commit-bot@chromium.org> Sat Jun 14 05:30:20 2014 -0700
tree ac2125dd7a653ea67b693ddd7937b41b41db73fb
parent c6dbd6f95ed3e2647a5ee0c44b2c317d0b8b913a

stop using SkBitmap::Config

R=scroggo@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/338493005

tools/skpdiff/SkCLImageDiffer.cpp

diff --git a/tools/skpdiff/SkCLImageDiffer.cpp b/tools/skpdiff/SkCLImageDiffer.cpp
index b99ef40..1c5d5c5 100644
--- a/tools/skpdiff/SkCLImageDiffer.cpp
+++ b/tools/skpdiff/SkCLImageDiffer.cpp
@@ -87,16 +87,16 @@
 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;