Recognize Adobe RGB profiles

src/core/SkColorSpace.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAtomics.h"
 #include "SkColorSpace.h"
 #include "SkOnce.h"
@@ skipping 25 matching lines @@
     , fUniqueID(sk_atomic_inc(&gUniqueColorSpaceID))
     , fNamed(kUnknown_Named)
 {}
 
 const float gSRGB_toXYZD50[] {
     0.4358f, 0.2224f, 0.0139f,    // * R
     0.3853f, 0.7170f, 0.0971f,    // * G
     0.1430f, 0.0606f, 0.7139f,    // * B
 };
 
+const float gAdobeRGB_toXYZD50[] {
+    0.6098f, 0.3111f, 0.0195f,    // * R
+    0.2052f, 0.6257f, 0.0609f,    // * G
+    0.1492f, 0.0632f, 0.7448f,    // * B
+};
+
+static bool xyz_almost_equal(const SkMatrix44& toXYZD50, const float* standard) {

[herb_g, 2016/05/12 17:18:22]

Add Comments stating that standard is a 3x3 matrix, or you could try float
(&standard)[3][3] as the parameter.

[msarett, 2016/05/12 17:31:52]

Done.

+    return color_space_almost_equal(toXYZD50.getFloat(0, 0), standard[0]) &&
+           color_space_almost_equal(toXYZD50.getFloat(0, 1), standard[1]) &&
+           color_space_almost_equal(toXYZD50.getFloat(0, 2), standard[2]) &&
+           color_space_almost_equal(toXYZD50.getFloat(1, 0), standard[3]) &&
+           color_space_almost_equal(toXYZD50.getFloat(1, 1), standard[4]) &&
+           color_space_almost_equal(toXYZD50.getFloat(1, 2), standard[5]) &&
+           color_space_almost_equal(toXYZD50.getFloat(2, 0), standard[6]) &&
+           color_space_almost_equal(toXYZD50.getFloat(2, 1), standard[7]) &&
+           color_space_almost_equal(toXYZD50.getFloat(2, 2), standard[8]) &&
+           color_space_almost_equal(toXYZD50.getFloat(0, 3), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(1, 3), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(2, 3), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(3, 0), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(3, 1), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(3, 2), 0.0f) &&
+           color_space_almost_equal(toXYZD50.getFloat(3, 3), 1.0f);
+}
+
 sk_sp<SkColorSpace> SkColorSpace::NewRGB(SkGammas gammas, const SkMatrix44& toXYZD50) {
-    // Check if we really have sRGB
+    // Check if we really have sRGB or Adobe RGB
     if (color_space_almost_equal(2.2f, gammas.fRed.fValue) &&
         color_space_almost_equal(2.2f, gammas.fGreen.fValue) &&
-        color_space_almost_equal(2.2f, gammas.fBlue.fValue) &&
-        color_space_almost_equal(toXYZD50.getFloat(0, 0), gSRGB_toXYZD50[0]) &&
-        color_space_almost_equal(toXYZD50.getFloat(0, 1), gSRGB_toXYZD50[1]) &&
-        color_space_almost_equal(toXYZD50.getFloat(0, 2), gSRGB_toXYZD50[2]) &&
-        color_space_almost_equal(toXYZD50.getFloat(1, 0), gSRGB_toXYZD50[3]) &&
-        color_space_almost_equal(toXYZD50.getFloat(1, 1), gSRGB_toXYZD50[4]) &&
-        color_space_almost_equal(toXYZD50.getFloat(1, 2), gSRGB_toXYZD50[5]) &&
-        color_space_almost_equal(toXYZD50.getFloat(2, 0), gSRGB_toXYZD50[6]) &&
-        color_space_almost_equal(toXYZD50.getFloat(2, 1), gSRGB_toXYZD50[7]) &&
-        color_space_almost_equal(toXYZD50.getFloat(2, 2), gSRGB_toXYZD50[8]) &&
-        color_space_almost_equal(toXYZD50.getFloat(0, 3), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(1, 3), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(2, 3), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(3, 0), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(3, 1), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(3, 2), 0.0f) &&
-        color_space_almost_equal(toXYZD50.getFloat(3, 3), 1.0f))
+        color_space_almost_equal(2.2f, gammas.fBlue.fValue))
     {
-        return SkColorSpace::NewNamed(kSRGB_Named);
+        if (xyz_almost_equal(toXYZD50, gSRGB_toXYZD50)) {
+            return SkColorSpace::NewNamed(kSRGB_Named);
+        } else if (xyz_almost_equal(toXYZD50, gAdobeRGB_toXYZD50)) {
+            return SkColorSpace::NewNamed(kAdobeRGB_Named);
+        }
     }
 
     return sk_sp<SkColorSpace>(new SkColorSpace(std::move(gammas), toXYZD50, kUnknown_Named));
 }
 
 sk_sp<SkColorSpace> SkColorSpace::NewNamed(Named named) {
-    static SkOnce once;
+    static SkOnce sRGBOnce;
     static SkColorSpace* sRGB;
+    static SkOnce adobeRGBOnce;
+    static SkColorSpace* adobeRGB;
 
     switch (named) {
         case kSRGB_Named: {
-            once([] {
+            sRGBOnce([] {
                 SkMatrix44 srgbToxyzD50(SkMatrix44::kUninitialized_Constructor);
                 srgbToxyzD50.set3x3ColMajorf(gSRGB_toXYZD50);
                 sRGB = new SkColorSpace(SkGammas(2.2f, 2.2f, 2.2f), srgbToxyzD50, kSRGB_Named);
             });
             return sk_ref_sp(sRGB);
         }
+        case kAdobeRGB_Named: {
+            adobeRGBOnce([] {
+                SkMatrix44 adobergbToxyzD50(SkMatrix44::kUninitialized_Constructor);
+                adobergbToxyzD50.set3x3ColMajorf(gAdobeRGB_toXYZD50);
+                adobeRGB = new SkColorSpace(SkGammas(2.2f, 2.2f, 2.2f), adobergbToxyzD50,
+                                            kAdobeRGB_Named);
+            });
+            return sk_ref_sp(adobeRGB);
+        }
         default:
             break;
     }
     return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "SkFixed.h"
 #include "SkTemplates.h"
@@ skipping 562 matching lines @@
                                                             toXYZ));
             }
 
         }
         default:
             break;
     }
 
     return_null("ICC profile contains unsupported colorspace");
 }