Index: src/codec/SkJpegDecoderMgr.cpp |
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp |
index cc44f3c42117cd1b285ee5651180f47bd2b602df..380b1a620fefd5df143303c3da01bab368fd2a01 100644 |
--- a/src/codec/SkJpegDecoderMgr.cpp |
+++ b/src/codec/SkJpegDecoderMgr.cpp |
@@ -34,12 +34,25 @@ SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Resu |
return result; |
} |
-SkColorType JpegDecoderMgr::getColorType() { |
+bool JpegDecoderMgr::getEncodedColor(SkEncodedInfo::Color* color) { |
switch (fDInfo.jpeg_color_space) { |
case JCS_GRAYSCALE: |
- return kGray_8_SkColorType; |
+ *color = SkEncodedInfo::kGray_Color; |
+ return true; |
+ case JCS_YCbCr: |
+ *color = SkEncodedInfo::kYUV_Color; |
+ return true; |
+ case JCS_RGB: |
+ *color = SkEncodedInfo::kRGB_Color; |
+ return true; |
+ case JCS_YCCK: |
+ *color = SkEncodedInfo::kYCCK_Color; |
+ return true; |
+ case JCS_CMYK: |
+ *color = SkEncodedInfo::kInvertedCMYK_Color; |
+ return true; |
default: |
- return kN32_SkColorType; |
+ return false; |
} |
} |