| Index: src/core/SkBitmapScaler.cpp
|
| diff --git a/src/core/SkBitmapScaler.cpp b/src/core/SkBitmapScaler.cpp
|
| index dc50464e54c837220811a2c55dc91bd321ab16a3..a90be05d634ba7491a1dca22bc8acc1423a85788 100644
|
| --- a/src/core/SkBitmapScaler.cpp
|
| +++ b/src/core/SkBitmapScaler.cpp
|
| @@ -275,7 +275,7 @@ bool SkBitmapScaler::Resize(SkBitmap* resultPtr,
|
|
|
| SkAutoLockPixels locker(source);
|
| if (!source.readyToDraw() ||
|
| - source.config() != SkBitmap::kARGB_8888_Config) {
|
| + source.colorType() != kPMColor_SkColorType) {
|
| return false;
|
| }
|
|
|
| @@ -290,9 +290,9 @@ bool SkBitmapScaler::Resize(SkBitmap* resultPtr,
|
|
|
| // Convolve into the result.
|
| SkBitmap result;
|
| - result.setConfig(SkBitmap::kARGB_8888_Config,
|
| - destSubset.width(), destSubset.height(), 0,
|
| - source.alphaType());
|
| + result.setConfig(SkImageInfo::MakeN32(destSubset.width(),
|
| + destSubset.height(),
|
| + source.alphaType()));
|
| result.allocPixels(allocator, NULL);
|
| if (!result.readyToDraw()) {
|
| return false;
|
|
|