summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp')
-rw-r--r--chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp b/chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp
index 9aaed869e36..3309af4685c 100644
--- a/chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp
+++ b/chromium/third_party/skia/src/ports/SkImageDecoder_WIC.cpp
@@ -186,7 +186,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
//Exit early if we're only looking for the bitmap bounds.
if (SUCCEEDED(hr)) {
- bm->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+ bm->setInfo(SkImageInfo::MakeN32Premul(width, height));
if (kDecodeBounds_WICMode == wicMode) {
return true;
}
@@ -306,10 +306,10 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
//Convert to 8888 if needed.
const SkBitmap* bitmap;
SkBitmap bitmapCopy;
- if (SkBitmap::kARGB_8888_Config == bitmapOrig.config() && bitmapOrig.isOpaque()) {
+ if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
bitmap = &bitmapOrig;
} else {
- if (!bitmapOrig.copyTo(&bitmapCopy, SkBitmap::kARGB_8888_Config)) {
+ if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) {
return false;
}
bitmap = &bitmapCopy;