diff options
| author |  reed <reed@chromium.org> | 2014-06-14 05:30:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-14 05:30:20 -0700 |
| commit | 0689d7b12e7c427a077b003d3d8ae759d86f798f (patch) | |
| tree | ac2125dd7a653ea67b693ddd7937b41b41db73fb /tools | |
| parent | c6dbd6f95ed3e2647a5ee0c44b2c317d0b8b913a (diff) | |
stop using SkBitmap::Config
R=scroggo@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/338493005
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/picture_utils.cpp | 4 | ||||
| -rw-r--r-- | tools/skpdiff/SkCLImageDiffer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index d88d922af9..597fd4878f 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -17,8 +17,8 @@ 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; } diff --git a/tools/skpdiff/SkCLImageDiffer.cpp b/tools/skpdiff/SkCLImageDiffer.cpp index b99ef40d70..1c5d5c56ea 100644 --- a/tools/skpdiff/SkCLImageDiffer.cpp +++ b/tools/skpdiff/SkCLImageDiffer.cpp @@ -87,16 +87,16 @@ bool SkCLImageDiffer::loadKernelSource(const char source[], const char name[], c 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; |