Revert of Switch SkJpegCode to libjpeg-turbo

src/codec/SkJpegDecoderMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkJpegDecoderMgr.h"
 #include "SkJpegUtility_codec.h"
 
@@ skipping 21 matching lines @@
     return false;
 }
 
 SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Result result) {
     print_message((j_common_ptr) &fDInfo, caller);
     return result;
 }
 
 SkColorType JpegDecoderMgr::getColorType() {
     switch (fDInfo.jpeg_color_space) {
+        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;
     }
 }
 
 JpegDecoderMgr::JpegDecoderMgr(SkStream* stream)
     : fSrcMgr(stream)
     , fInit(false)
 {
     // Error manager must be set before any calls to libjeg in order to handle failures
-    fDInfo.err = turbo_jpeg_std_error(&fErrorMgr);
+    fDInfo.err = jpeg_std_error(&fErrorMgr);
     fErrorMgr.error_exit = skjpeg_err_exit;
 }
 
 void JpegDecoderMgr::init() {
     jpeg_create_decompress(&fDInfo);
     fInit = true;
     fDInfo.src = &fSrcMgr;
     fDInfo.err->emit_message = &emit_message;
     fDInfo.err->output_message = &output_message;
 }
 
 JpegDecoderMgr::~JpegDecoderMgr() {
     if (fInit) {
         jpeg_destroy_decompress(&fDInfo);
     }
 }
 
 jmp_buf& JpegDecoderMgr::getJmpBuf() {
     return fErrorMgr.fJmpBuf;
 }
 
 jpeg_decompress_struct* JpegDecoderMgr::dinfo() {
     return &fDInfo;
 }