aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
diff options
context:
space:
mode:
Diffstat (limited to 'src/ports')
-rw-r--r--src/ports/SkImageDecoder_CG.cpp2
-rw-r--r--src/ports/SkImageDecoder_WIC.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index c683752fdd..c61ce98a8b 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -209,7 +209,7 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm,
// <Error>: CGImageDestinationFinalize image destination does not have enough images
// So instead we copy to 8888.
if (bm.colorType() == kARGB_4444_SkColorType) {
- bm.copyTo(&bitmap8888, kN32_SkColorType);
+ bm.copyTo(&bitmap8888, kPMColor_SkColorType);
bmPtr = &bitmap8888;
}
type = kUTTypePNG;
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 74b2c39195..9d5479497e 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -306,10 +306,10 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
//Convert to 8888 if needed.
const SkBitmap* bitmap;
SkBitmap bitmapCopy;
- if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
+ if (kPMColor_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
bitmap = &bitmapOrig;
} else {
- if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) {
+ if (!bitmapOrig.copyTo(&bitmapCopy, kPMColor_SkColorType)) {
return false;
}
bitmap = &bitmapCopy;