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 /src/gpu/SkGr.cpp | |
| 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 'src/gpu/SkGr.cpp')
| -rw-r--r-- | src/gpu/SkGr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index c4720b58c8..34e5d0fde3 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -32,7 +32,7 @@ as the colortable.count says it is. */ static void build_compressed_data(void* buffer, const SkBitmap& bitmap) { - SkASSERT(SkBitmap::kIndex8_Config == bitmap.config()); + SkASSERT(kIndex_8_SkColorType == bitmap.colorType()); SkAutoLockPixels alp(bitmap); if (!bitmap.readyToDraw()) { @@ -203,7 +203,7 @@ static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx, GrTextureDesc desc; generate_bitmap_texture_desc(*bitmap, &desc); - if (SkBitmap::kIndex8_Config == bitmap->config()) { + if (kIndex_8_SkColorType == bitmap->colorType()) { // build_compressed_data doesn't do npot->pot expansion // and paletted textures can't be sub-updated if (ctx->supportsIndex8PixelConfig(params, bitmap->width(), bitmap->height())) { |