Color: Read embedded ICC profiles regardless of QCMS

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 276 matching lines @@
     ASSERT((i >= 0) && i < 3);
     return m_planes[i];
 }
 
 size_t ImagePlanes::rowBytes(int i) const
 {
     ASSERT((i >= 0) && i < 3);
     return m_rowBytes[i];
 }
 
+namespace {
+
 #if USE(QCMSLIB)
-namespace {
 
 const unsigned kIccColorProfileHeaderLength = 128;
 
 bool rgbColorProfile(const char* profileData, unsigned profileLength)
 {
     ASSERT_UNUSED(profileLength, profileLength >= kIccColorProfileHeaderLength);
 
     return !memcmp(&profileData[16], "RGB ", 4);
 }
 
 bool inputDeviceColorProfile(const char* profileData, unsigned profileLength)
 {
     ASSERT_UNUSED(profileLength, profileLength >= kIccColorProfileHeaderLength);
 
     return !memcmp(&profileData[12], "mntr", 4) || !memcmp(&profileData[12], "scnr", 4);
 }
 
 // The output device color profile is global and shared across multiple threads.
 SpinLock gTargetColorProfileLock;
 qcms_profile* gTargetColorProfile = nullptr;
 
+#endif // USE(QCMSLIB)
+
 } // namespace
 
 // static
 void ImageDecoder::setTargetColorProfile(const WebVector<char>& profile)
 {
+#if USE(QCMSLIB)
     if (profile.isEmpty())
         return;
 
     // Take a lock around initializing and accessing the global device color profile.
     SpinLock::Guard guard(gTargetColorProfileLock);
 
     // Layout tests expect that only the first call will take effect.
     if (gTargetColorProfile)
         return;
 
     {
         sk_sp<SkColorSpace> colorSpace = SkColorSpace::NewICC(profile.data(), profile.size());
         BitmapImageMetrics::countGamma(colorSpace.get());
     }
 
     // FIXME: Add optional ICCv4 support and support for multiple monitors.
     gTargetColorProfile = qcms_profile_from_memory(profile.data(), profile.size());
     if (!gTargetColorProfile)
         return;
 
     if (qcms_profile_is_bogus(gTargetColorProfile)) {
         qcms_profile_release(gTargetColorProfile);
         gTargetColorProfile = nullptr;
         return;
     }
 
     qcms_profile_precache_output_transform(gTargetColorProfile);
+#endif // USE(QCMSLIB)
 }
 
-bool ImageDecoder::hasColorProfile() const
+void ImageDecoder::setColorProfileAndComputeTransform(const char* iccData, unsigned iccLength, bool hasAlpha, bool useSRGB)
 {
-    return m_sourceToOutputDeviceColorTransform.get();
-}
+    // Sub-classes should not call this if they were instructed to ignore embedded color profiles.
+    DCHECK(!m_ignoreGammaAndColorProfile);
 
-void ImageDecoder::setColorProfileAndTransform(const char* iccData, unsigned iccLength, bool hasAlpha, bool useSRGB)
-{
+    m_colorProfile.assign(iccData, iccLength);
+    m_hasColorProfile = true;
+
+#if USE(QCMSLIB)
     m_sourceToOutputDeviceColorTransform.reset();
 
     // Create the input profile
     QCMSProfileUniquePtr inputProfile;
     if (useSRGB) {
         inputProfile.reset(qcms_profile_sRGB());
     } else {
         // Only accept RGB color profiles from input class devices.
         if (iccLength < kIccColorProfileHeaderLength)
             return;
@@ skipping 18 matching lines @@
         qcms_profile_precache_output_transform(gTargetColorProfile);
     }
 
     if (qcms_profile_match(inputProfile.get(), gTargetColorProfile))
         return;
 
     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_sourceToOutputDeviceColorTransform.reset(qcms_transform_create(inputProfile.get(), dataFormat, gTargetColorProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPTUAL));
+#endif // USE(QCMSLIB)
 }
 
-#else // USE(QCMSLIB)
-
-void ImageDecoder::setTargetColorProfile(const WebVector<char>&)
-{
-}
-
-bool ImageDecoder::hasColorProfile() const
-{
-    return false;
-}
-
-#endif // USE(QCMSLIB)
-
 } // namespace blink