[wip] image color correction

Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 111 matching lines @@
     {
         close();
     }
 
     void close()
     {
         if (m_png && m_info)
             // This will zero the pointers.
             png_destroy_read_struct(&m_png, &m_info, 0);
 #if USE(QCMSLIB)
-        if (m_transform)
-            qcms_transform_release(m_transform);
-        m_transform = 0;
+        clearColorTransform();
 #endif
         delete[] m_interlaceBuffer;
         m_interlaceBuffer = 0;
         m_readOffset = 0;
     }
 
     bool decode(const SharedBuffer& data, bool sizeOnly)
     {
         m_decodingSizeOnly = sizeOnly;
         PNGImageDecoder* decoder = static_cast<PNGImageDecoder*>(png_get_progressive_ptr(m_png));
@@ skipping 25 matching lines @@
     void setHasAlpha(bool hasAlpha) { m_hasAlpha = hasAlpha; }
     bool hasAlpha() const { return m_hasAlpha; }
 
     png_bytep interlaceBuffer() const { return m_interlaceBuffer; }
     void createInterlaceBuffer(int size) { m_interlaceBuffer = new png_byte[size]; }
 #if USE(QCMSLIB)
     png_bytep rowBuffer() const { return m_rowBuffer.get(); }
     void createRowBuffer(int size) { m_rowBuffer = adoptArrayPtr(new png_byte[size]); }
     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 and RGBA images.
         ASSERT(icSigRgbData == qcms_profile_get_color_space(inputProfile));
@@ skipping 61 matching lines @@
 }
 
 bool PNGImageDecoder::setFailed()
 {
     if (m_doNothingOnFailure)
         return false;
     m_reader.clear();
     return ImageDecoder::setFailed();
 }
 
+PassRefPtr<ColorSpaceProfile> PNGImageDecoder::colorProfile() const
+{
+#if USE(QCMSLIB)
+    return m_colorProfile;
+#else
+    return nullptr;
+#endif
+}
+
 #if USE(QCMSLIB)
 static void readColorProfile(png_structp png, png_infop info, ColorProfile& colorProfile)
 {
 #ifdef PNG_iCCP_SUPPORTED
     char* profileName;
     int compressionType;
 #if (PNG_LIBPNG_VER < 10500)
     png_charp profile;
 #else
     png_bytep profile;
@@ skipping 73 matching lines @@
         // color profiles for gray-scale images is slightly tricky, at least using the
         // CoreGraphics ICC library, because we expand gray-scale images to RGB but we
         // do not similarly transform the color profile. We'd either need to transform
         // the color profile or we'd need to decode into a gray-scale image buffer and
         // hand that to CoreGraphics.
         ColorProfile colorProfile;
         readColorProfile(png, info, colorProfile);
         bool decodedImageHasAlpha = (colorType & PNG_COLOR_MASK_ALPHA) || trnsCount;
         m_reader->createColorTransform(colorProfile, decodedImageHasAlpha);
         m_hasColorProfile = !!m_reader->colorTransform();
+        if (m_hasColorProfile) {
+            // 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);
+            m_hasColorProfile = !!imageColorProfile->profile();
+            m_colorProfile = m_hasColorProfile ? imageColorProfile : nullptr;
+            // Don't color correct decoded frames during decoding.
+            m_reader->clearColorTransform();
+            ASSERT(!m_reader->colorTransform());
+        }
     }
 #endif
 
     // Deal with gamma and keep it under our control.
     double gamma;
     if (!m_ignoreGammaAndColorProfile && png_get_gAMA(png, info, &gamma)) {
         if ((gamma <= 0.0) || (gamma > cMaxGamma)) {
             gamma = cInverseGamma;
             png_set_gAMA(png, info, gamma);
         }
@@ skipping 168 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 PNGImageReader
     // anymore.  (If we failed, |m_reader| has already been cleared.)
     else if (isComplete())
         m_reader.clear();
 }
 
 } // namespace WebCore