[wip] image color correction

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 287 matching lines @@
     }
 
     void close()
     {
         decoder_source_mgr* src = (decoder_source_mgr*)m_info.src;
         if (src)
             fastFree(src);
         m_info.src = 0;
 
 #if USE(QCMSLIB)
-        if (m_transform)
-            qcms_transform_release(m_transform);
-        m_transform = 0;
+        clearColorTransform();
 #endif
         jpeg_destroy_decompress(&m_info);
     }
 
     void skipBytes(long numBytes)
     {
         decoder_source_mgr* src = (decoder_source_mgr*)m_info.src;
         long bytesToSkip = std::min(numBytes, (long)src->pub.bytes_in_buffer);
         src->pub.bytes_in_buffer -= (size_t)bytesToSkip;
         src->pub.next_input_byte += bytesToSkip;
@@ skipping 63 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));
+                m_decoder->setHasColorProfile(!!m_transform);
+                if (m_transform) {
+                    // FIXME: paint-time color correction is assumed here.
+                    qcms_profile* profile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
+                    RefPtr<ColorSpaceProfile> imageColorProfile = ColorSpaceProfile::create(profile);
+                    bool hasColorProfile = !!imageColorProfile->profile();
+                    m_decoder->setHasColorProfile(hasColorProfile);
+                    m_decoder->setColorProfile(hasColorProfile ? imageColorProfile : nullptr);
+                    // Don't color correct decoded frames during decoding.
+                    clearColorTransform();
+                    ASSERT(!m_transform);
+                }
 #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
             // 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;
@@ skipping 104 matching lines @@
 
         return true;
     }
 
     jpeg_decompress_struct* info() { return &m_info; }
     JSAMPARRAY samples() const { return m_samples; }
     JPEGImageDecoder* decoder() { return m_decoder; }
 #if USE(QCMSLIB)
     qcms_transform* colorTransform() const { return m_transform; }
 
-    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha)
+    void clearColorTransform()
     {
         if (m_transform)
             qcms_transform_release(m_transform);
         m_transform = 0;
+    }
 
+    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha)
+    {
+        clearColorTransform();
         if (colorProfile.isEmpty())
             return;
         qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
         if (!deviceProfile)
             return;
         qcms_profile* inputProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
         if (!inputProfile)
             return;
         // We currently only support color profiles for RGB profiled images.
         ASSERT(icSigRgbData == qcms_profile_get_color_space(inputProfile));
@@ skipping 118 matching lines @@
     if (frame.status() != ImageFrame::FrameComplete) {
         PlatformInstrumentation::willDecodeImage("JPEG");
         decode(false);
         PlatformInstrumentation::didDecodeImage();
     }
 
     frame.notifyBitmapIfPixelsChanged();
     return &frame;
 }
 
+PassRefPtr<ColorSpaceProfile> JPEGImageDecoder::colorProfile() const
+{
+#if USE(QCMSLIB)
+    return m_colorProfile;
+#else
+    return nullptr;
+#endif
+}
+
 bool JPEGImageDecoder::setFailed()
 {
     m_reader.clear();
     return ImageDecoder::setFailed();
 }
 
 template <J_COLOR_SPACE colorSpace> void setPixel(ImageFrame& buffer, ImageFrame::PixelData* pixel, JSAMPARRAY samples, int column)
 {
     JSAMPLE* jsample = *samples + column * (colorSpace == JCS_RGB ? 3 : 4);
 
@@ skipping 120 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();
 }
 
 }