diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-20 20:55:37 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-20 20:55:37 +0000 |
commit | 900ecf2f1579d42c9d2959831787af0346320f86 (patch) | |
tree | 243e1157f2675f3e62b61505e0929ade2a05da93 /src/core/SkBitmapProcShader.cpp | |
parent | 0a2bf90dccba3bde188e0386a7f0c60e6dde1ae9 (diff) |
use colortype instead of config
patch from issue 172063004
BUG=skia:
R=scroggo@google.com
Review URL: https://codereview.chromium.org/173893002
git-svn-id: http://skia.googlecode.com/svn/trunk@13520 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmapProcShader.cpp')
-rw-r--r-- | src/core/SkBitmapProcShader.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index d7c7269c89..74b9e86669 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -18,11 +18,11 @@ #endif bool SkBitmapProcShader::CanDo(const SkBitmap& bm, TileMode tx, TileMode ty) { - switch (bm.config()) { - case SkBitmap::kA8_Config: - case SkBitmap::kRGB_565_Config: - case SkBitmap::kIndex8_Config: - case SkBitmap::kARGB_8888_Config: + switch (bm.colorType()) { + case kAlpha_8_SkColorType: + case kRGB_565_SkColorType: + case kIndex_8_SkColorType: + case kPMColor_SkColorType: // if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx)) return true; default: @@ -88,7 +88,7 @@ static bool valid_for_drawing(const SkBitmap& bm) { if (NULL == bm.pixelRef()) { return false; // no pixels to read } - if (SkBitmap::kIndex8_Config == bm.config()) { + if (kIndex_8_SkColorType == bm.colorType()) { // ugh, I have to lock-pixels to inspect the colortable SkAutoLockPixels alp(bm); if (!bm.getColorTable()) { @@ -125,23 +125,23 @@ bool SkBitmapProcShader::setContext(const SkBitmap& device, flags |= kOpaqueAlpha_Flag; } - switch (bitmap.config()) { - case SkBitmap::kRGB_565_Config: + switch (bitmap.colorType()) { + case kRGB_565_SkColorType: flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag); break; - case SkBitmap::kIndex8_Config: - case SkBitmap::kARGB_8888_Config: + case kIndex_8_SkColorType: + case kPMColor_SkColorType: if (bitmapIsOpaque) { flags |= kHasSpan16_Flag; } break; - case SkBitmap::kA8_Config: + case kAlpha_8_SkColorType: break; // never set kHasSpan16_Flag default: break; } - if (paint.isDither() && bitmap.config() != SkBitmap::kRGB_565_Config) { + if (paint.isDither() && bitmap.colorType() != kRGB_565_SkColorType) { // gradients can auto-dither in their 16bit sampler, but we don't so // we clear the flag here. flags &= ~kHasSpan16_Flag; @@ -278,14 +278,14 @@ static bool canUseColorShader(const SkBitmap& bm, SkColor* color) { return false; } - switch (bm.config()) { - case SkBitmap::kARGB_8888_Config: + switch (bm.colorType()) { + case kPMColor_SkColorType: *color = SkUnPreMultiply::PMColorToColor(*bm.getAddr32(0, 0)); return true; - case SkBitmap::kRGB_565_Config: + case kRGB_565_SkColorType: *color = SkPixel16ToColor(*bm.getAddr16(0, 0)); return true; - case SkBitmap::kIndex8_Config: + case kIndex_8_SkColorType: *color = SkUnPreMultiply::PMColorToColor(bm.getIndex8Color(0, 0)); return true; default: // just skip the other configs for now |