Switch SkJpegCode to libjpeg-turbo

src/codec/SkJpegDecoderMgr.cpp

Index: src/codec/SkJpegDecoderMgr.cpp
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp
index e60f4663379abcc094360b237b228c9140438be1..451a4ef68bd20f3ea9e46e8d2c42958128092e79 100644
--- a/src/codec/SkJpegDecoderMgr.cpp
+++ b/src/codec/SkJpegDecoderMgr.cpp
@@ -39,22 +39,9 @@ SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Resu
 
 SkColorType JpegDecoderMgr::getColorType() {
     switch (fDInfo.jpeg_color_space) {

[scroggo, 2015/06/16 20:39:23]

Isn't there an option for 565?

[msarett, 2015/06/18 21:06:10]

This function returns the color space that we will recommend.  We never
recommend 565, but will support it if the client asks for it.

-        case JCS_CMYK:
-        case JCS_YCCK:
-            // libjpeg cannot convert from CMYK or YCCK to RGB.
-            // Here, we ask libjpeg to give us CMYK samples back and
-            // we will later manually convert them to RGB.
-            fDInfo.out_color_space = JCS_CMYK;
-            return kN32_SkColorType;
         case JCS_GRAYSCALE:
-            fDInfo.out_color_space = JCS_GRAYSCALE;
             return kGray_8_SkColorType;
         default:
-#ifdef ANDROID_RGB
-            fDInfo.out_color_space = JCS_RGBA_8888;
-#else
-            fDInfo.out_color_space = JCS_RGB;
-#endif
             return kN32_SkColorType;
     }
 }