[poc] curve-filter

third_party/WebKit/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>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 21 matching lines @@
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "config.h"
 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
 
 #include "platform/PlatformInstrumentation.h"
+#include "platform/graphics/GraphicsScreen.h"
 
 extern "C" {
 #include <stdio.h> // jpeglib.h needs stdio FILE.
 #include "jpeglib.h"
 #if USE(ICCJPEG)
 #include "iccjpeg.h"
 #endif
 #if USE(QCMSLIB)
 #include "qcms.h"
 #endif
@@ skipping 418 matching lines @@
             jpeg_calc_output_dimensions(&m_info);
             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) {
+                bool imageHasAlpha = colorSpaceHasAlpha(m_info.out_color_space);
+                RefPtr<ColorSpaceProfile> imageColorProfile = createColorTransform(colorProfile, imageHasAlpha);
+                m_decoder->setHasColorProfile(!!imageColorProfile.get());
+
+                if (m_decoder->hasColorProfile() && imageColorProfilesEnabled()) {
+                    // FIXME: allow YUV decoding of color profiled images.
+                    overrideColorSpace = JCS_UNKNOWN;
+                    RELEASE_ASSERT(imageColorProfile->profile());
+                    m_decoder->setColorProfile(imageColorProfile);
+                    // Do not color correct decoded frames during decoding.
+                    clearColorTransform();
+                    RELEASE_ASSERT(!m_transform);
+                }
+
+                if (m_decoder->hasColorProfile() && !imageColorProfilesEnabled()) {
+                    // FIXME: allow YUV decoding of color profiled images.
                     overrideColorSpace = JCS_UNKNOWN;
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
                     // Input RGBA data to qcms. Note: restored to BGRA on output.
                     if (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_YCbCr) {
                 m_info.out_color_space = JCS_YCbCr;
                 m_info.raw_data_out = TRUE;
                 m_uvSize = computeYUVSize(&m_info, 1, ImageDecoder::SizeForMemoryAllocation); // U size and V size have to be the same if we got here
             }
 
             // Don't allocate a giant and superfluous memory buffer when the
             // image is a sequential JPEG.
@@ skipping 128 matching lines @@
 #if USE(QCMSLIB)
     qcms_transform* colorTransform() const { return m_transform; }
 
     void clearColorTransform()
     {
         if (m_transform)
             qcms_transform_release(m_transform);
         m_transform = 0;
     }
 
-    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha)
+    PassRefPtr<ColorSpaceProfile> createColorTransform(const ColorProfile& colorProfile, bool hasAlpha)
     {
         clearColorTransform();
 
         if (colorProfile.isEmpty())
-            return;
+            return nullptr;
+
         qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
         if (!deviceProfile)
-            return;
+            return nullptr;
+
         qcms_profile* inputProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
         if (!inputProfile)
-            return;
+            return nullptr;
+
         // We currently only support color profiles for RGB profiled images.
         ASSERT(rgbData == qcms_profile_get_color_space(inputProfile));
         qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8;
         // FIXME: Don't force perceptual intent if the image profile contains an intent.
         m_transform = qcms_transform_create(inputProfile, dataFormat, deviceProfile, dataFormat, QCMS_INTENT_PERCEPTUAL);
+        if (m_transform)
+            return ColorSpaceProfile::create(inputProfile);
+
         qcms_profile_release(inputProfile);
+        return nullptr;
     }
 #endif
 
 private:
     JSAMPARRAY allocateSampleArray()
     {
         // Some output color spaces don't need the sample array: don't allocate in that case.
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
         if (turboSwizzled(m_info.out_color_space))
             return nullptr;
@@ skipping 394 matching lines @@
     // has failed.
     if (!m_reader->decode(onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the JPEGImageReader anymore.
     if (isComplete(this, onlySize) || failed())
         m_reader.clear();
 }
 
 }