Index: src/codec/SkJpegDecoderMgr.cpp |
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp |
index 63228bb58501000476f4888c01a4abe1656e09a2..8517e0dac2ec494315e67eacb8b532efe41655bb 100644 |
--- a/src/codec/SkJpegDecoderMgr.cpp |
+++ b/src/codec/SkJpegDecoderMgr.cpp |
@@ -35,12 +35,20 @@ SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Resu |
return result; |
} |
-SkColorType JpegDecoderMgr::getColorType() { |
+SkEncodedInfo::Color JpegDecoderMgr::getEncodedColor() { |
switch (fDInfo.jpeg_color_space) { |
case JCS_GRAYSCALE: |
- return kGray_8_SkColorType; |
+ return SkEncodedInfo::kGray_Color; |
+ case JCS_YCbCr: |
+ return SkEncodedInfo::kYUV_Color; |
+ case JCS_RGB: |
+ return SkEncodedInfo::kRGB_Color; |
+ case JCS_YCCK: |
+ return SkEncodedInfo::kYCCK_Color; |
+ case JCS_CMYK: |
+ return SkEncodedInfo::kInvertedCMYK_Color; |
default: |
- return kN32_SkColorType; |
+ return SkEncodedInfo::kUnknown_Color; |
} |
} |