Drop support for libjpeg-turbo < 1.2 in SkJpegCodec

src/codec/SkJpegCodec.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 "SkCodec.h"
 #include "SkMSAN.h"
 #include "SkJpegCodec.h"
@@ skipping 355 matching lines @@
     // Check if we will decode to CMYK because a conversion to RGBA is not supported
     J_COLOR_SPACE colorSpace = fDecoderMgr->dinfo()->jpeg_color_space;
     bool isCMYK = JCS_CMYK == colorSpace || JCS_YCCK == colorSpace;
 
     // Check for valid color types and set the output color space
     switch (dst.colorType()) {
         case kRGBA_8888_SkColorType:
             if (isCMYK) {
                 fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
             } else {
-#ifdef LIBJPEG_TURBO_VERSION
-            fDecoderMgr->dinfo()->out_color_space = JCS_EXT_RGBA;
-#else
-            fDecoderMgr->dinfo()->out_color_space = JCS_RGB;
-#endif
+                fDecoderMgr->dinfo()->out_color_space = JCS_EXT_RGBA;
             }
             return true;
         case kBGRA_8888_SkColorType:
             if (isCMYK) {
                 fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
             } else {
-#ifdef LIBJPEG_TURBO_VERSION
-            fDecoderMgr->dinfo()->out_color_space = JCS_EXT_BGRA;
-#else
-            fDecoderMgr->dinfo()->out_color_space = JCS_RGB;
-#endif
+                fDecoderMgr->dinfo()->out_color_space = JCS_EXT_BGRA;
             }
             return true;
         case kRGB_565_SkColorType:
             if (isCMYK) {
                 fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
             } else {
 #ifdef TURBO_HAS_565
                 fDecoderMgr->dinfo()->dither_mode = JDITHER_NONE;
                 fDecoderMgr->dinfo()->out_color_space = JCS_RGB565;
 #else
@@ skipping 108 matching lines @@
     }
 
     for (uint32_t y = 0; y < dstHeight; y++) {
         // Read rows of the image
         uint32_t lines = jpeg_read_scanlines(dinfo, &dstRow, 1);
         sk_msan_mark_initialized(dstRow, dstRow + dstRowBytes, "skbug.com/4550");
 
         // If we cannot read enough rows, assume the input is incomplete
         if (lines != 1) {
             *rowsDecoded = y;
-
             return fDecoderMgr->returnFailure("Incomplete image data", kIncompleteInput);
         }
 
         if (fSwizzler) {
             // use swizzler to sample row
             fSwizzler->swizzle(dst, dstRow);
             dst = SkTAddOffset<JSAMPLE>(dst, dstRowBytes);
         } else {
             dstRow = SkTAddOffset<JSAMPLE>(dstRow, dstRowBytes);
         }
@@ skipping 62 matching lines @@
     if (!this->setOutputColorSpace(dstInfo)) {
         return kInvalidConversion;
     }
 
     // Now, given valid output dimensions, we can start the decompress
     if (!jpeg_start_decompress(fDecoderMgr->dinfo())) {
         SkCodecPrintf("start decompress failed\n");
         return kInvalidInput;
     }
 
-    if (options.fSubset) {

[msarett, 2016/07/21 15:26:53]

Just moved this code block because it was confusing me as it was.

-        fSwizzlerSubset = *options.fSubset;
-    }
-
 #ifdef TURBO_HAS_CROP
     if (options.fSubset) {
         uint32_t startX = options.fSubset->x();
         uint32_t width = options.fSubset->width();
 
         // libjpeg-turbo may need to align startX to a multiple of the IDCT
         // block size.  If this is the case, it will decrease the value of
         // startX to the appropriate alignment and also increase the value
         // of width so that the right edge of the requested subset remains
         // the same.
@@ skipping 23 matching lines @@
                 width != (uint32_t) options.fSubset->width()) {
             this->initializeSwizzler(dstInfo, options);
         }
     }
 
     // Make sure we have a swizzler if we are converting from CMYK.
     if (!fSwizzler && JCS_CMYK == fDecoderMgr->dinfo()->out_color_space) {
         this->initializeSwizzler(dstInfo, options);
     }
 #else
+    if (options.fSubset) {
+        fSwizzlerSubset = *options.fSubset;
+    }
+
     // We will need a swizzler if we are performing a subset decode or
     // converting from CMYK.
     J_COLOR_SPACE colorSpace = fDecoderMgr->dinfo()->out_color_space;
     if (options.fSubset || JCS_CMYK == colorSpace || JCS_RGB == colorSpace) {
         this->initializeSwizzler(dstInfo, options);
     }
 #endif
 
     return kSuccess;
 }
@@ skipping 248 matching lines @@
 
         JDIMENSION linesRead = jpeg_read_raw_data(dinfo, yuv, numRowsPerBlock);
         if (linesRead < remainingRows) {
             // FIXME: Handle incomplete YUV decodes without signalling an error.
             return kInvalidInput;
         }
     }
 
     return kSuccess;
 }