Follow up on previous cl

Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
@@ skipping 241 matching lines @@
 }
 #endif
 
 static IntSize computeUVSize(const jpeg_decompress_struct* info)
 {
     int h = info->cur_comp_info[0]->h_samp_factor;
     int v = info->cur_comp_info[0]->v_samp_factor;
     return IntSize((info->output_width + h - 1) / h, (info->output_height + v - 1) / v);
 }
 
-static yuv_subsampling getYUVSubsampling(const jpeg_decompress_struct& info)
+static yuv_subsampling yuvSubsampling(const jpeg_decompress_struct& info)
 {
     if ((DCTSIZE == 8)
         && (info.num_components == 3)
         && (info.scale_denom <= 8)
         && (info.cur_comp_info[1]->h_samp_factor == 1)
         && (info.cur_comp_info[1]->v_samp_factor == 1)
         && (info.cur_comp_info[2]->h_samp_factor == 1)
         && (info.cur_comp_info[2]->v_samp_factor == 1)) {
         int h = info.cur_comp_info[0]->h_samp_factor;
         int v = info.cur_comp_info[0]->v_samp_factor;
@@ skipping 120 matching lines @@
         // If we still have bytes to skip, try to skip those now.
         if (m_bytesToSkip)
             skipBytes(m_bytesToSkip);
 
         m_bufferLength = data.size();
 
         // We need to do the setjmp here. Otherwise bad things will happen
         if (setjmp(m_err.setjmp_buffer))
             return m_decoder->setFailed();
 
+        J_COLOR_SPACE overrideColorSpace = JCS_UNKNOWN;
         switch (m_state) {
         case JPEG_HEADER:
             // Read file parameters with jpeg_read_header().
             if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
                 return false; // I/O suspension.
 
             switch (m_info.jpeg_color_space) {
             case JCS_YCbCr:
                 // libjpeg can convert YCbCr image pixels to RGB.
                 m_info.out_color_space = rgbOutputColorSpace();
-                if (m_decoder->YUVDecoding() && (getYUVSubsampling(m_info) != YUV_UNKNOWN)) {
-                    m_info.out_color_space = JCS_YCbCr;
-                    m_info.raw_data_out = TRUE;
+                if (m_decoder->YUVDecoding() && (yuvSubsampling(m_info) != YUV_UNKNOWN)) {
+                    overrideColorSpace = JCS_YCbCr;
                 }
                 break;
             case JCS_GRAYSCALE:
             case JCS_RGB:
                 // libjpeg can convert GRAYSCALE image pixels to RGB.
                 m_info.out_color_space = rgbOutputColorSpace();
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
                 if (m_info.saw_JFIF_marker)
                     break;
                 // FIXME: Swizzle decoding does not support Adobe transform=0
@@ skipping 25 matching lines @@
             m_decoder->setDecodedSize(m_info.output_width, m_info.output_height);
 
             m_decoder->setOrientation(readImageOrientation(info()));
 
 #if USE(QCMSLIB)
             // Allow color management of the decoded RGBA pixels if possible.
             if (!m_decoder->ignoresGammaAndColorProfile()) {
                 ColorProfile colorProfile;
                 readColorProfile(info(), colorProfile);
                 createColorTransform(colorProfile, colorSpaceHasAlpha(m_info.out_color_space));
-                if (m_transform && m_info.out_color_space == JCS_YCbCr) {
-                    m_info.out_color_space = rgbOutputColorSpace();
-                    m_info.raw_data_out = FALSE;
-                }
+                overrideColorSpace = JCS_UNKNOWN;
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
                 // Input RGBA data to qcms. Note: restored to BGRA on output.
                 if (m_transform && m_info.out_color_space == JCS_EXT_BGRA)
                     m_info.out_color_space = JCS_EXT_RGBA;
 #endif
                 m_decoder->setHasColorProfile(!!m_transform);
             }
 #endif
+            if (overrideColorSpace != JCS_UNKNOWN) {

[Noel Gordon, 2014/08/20 16:24:15]

Is this if statement needed?

+                if (overrideColorSpace == JCS_YCbCr) {
+                    m_info.out_color_space = JCS_YCbCr;
+                    m_info.raw_data_out = TRUE;
+                }
+            }
+
             // Don't allocate a giant and superfluous memory buffer when the
             // image is a sequential JPEG.
             m_info.buffered_image = jpeg_has_multiple_scans(&m_info);
 
             if (onlySize) {
                 // We can stop here. Reduce our buffer length and available data.
                 m_bufferLength -= m_info.src->bytes_in_buffer;
                 m_info.src->bytes_in_buffer = 0;
                 return true;
             }
@@ skipping 502 matching lines @@
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
     // If we're done decoding the image, we don't need the JPEGImageReader
     // anymore.  (If we failed, |m_reader| has already been cleared.)
     else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache[0].status() == ImageFrame::FrameComplete))
         m_reader.clear();
 }
 
 }