| Index: src/core/SkScalerContext.cpp
|
| diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
|
| index 1c148776674d6f39311ce8d52d9b478079e11eeb..d0d24eebe8c0f077404bc8b96630b7ddbd06ef1c 100644
|
| --- a/src/core/SkScalerContext.cpp
|
| +++ b/src/core/SkScalerContext.cpp
|
| @@ -428,7 +428,7 @@ static void pack4xHToLCD16(const SkBitmap& src, const SkMask& dst,
|
| const SkMaskGamma::PreBlend& maskPreBlend) {
|
| #define SAMPLES_PER_PIXEL 4
|
| #define LCD_PER_PIXEL 3
|
| - SkASSERT(SkBitmap::kA8_Config == src.config());
|
| + SkASSERT(kAlpha_8_SkColorType == src.colorType());
|
| SkASSERT(SkMask::kLCD16_Format == dst.fFormat);
|
|
|
| const int sample_width = src.width();
|
| @@ -502,7 +502,7 @@ static void pack4xHToLCD16(const SkBitmap& src, const SkMask& dst,
|
| template<bool APPLY_PREBLEND>
|
| static void pack4xHToLCD32(const SkBitmap& src, const SkMask& dst,
|
| const SkMaskGamma::PreBlend& maskPreBlend) {
|
| - SkASSERT(SkBitmap::kA8_Config == src.config());
|
| + SkASSERT(kAlpha_8_SkColorType == src.colorType());
|
| SkASSERT(SkMask::kLCD32_Format == dst.fFormat);
|
|
|
| const int width = dst.fBounds.width();
|
|
|