Support for custom primaries

ui/gfx/color_transform.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/color_transform.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "ui/gfx/color_space.h"
@@ skipping 482 matching lines @@
   NOTREACHED();
   return Transform();
 }
 
 class ColorSpaceToColorSpaceTransform : public ColorTransform {
  public:
   ColorSpaceToColorSpaceTransform(const ColorSpace& from,
                                   const ColorSpace& to,
                                   Intent intent)
       : from_(from), to_(to) {
-    if (intent == Intent::PERCEPTUAL) {
+    if (intent == Intent::INTENT_PERCEPTUAL) {
       switch (from_.transfer_) {
         case ColorSpace::TransferID::UNSPECIFIED:
         case ColorSpace::TransferID::BT709:
         case ColorSpace::TransferID::SMPTE170M:
           // See SMPTE 1886
           from_.transfer_ = ColorSpace::TransferID::GAMMA24;
           break;
 
         default:  // Do nothing
           break;
       }
 
       // TODO(hubbe): shrink gamuts here (never stretch gamuts)
     }
 
     Transform* from_transfer_matrix =
         from_.matrix_ == ColorSpace::MatrixID::BT2020_CL ? &b_ : &a_;
     Transform* to_transfer_matrix =
         to_.matrix_ == ColorSpace::MatrixID::BT2020_CL ? &b_ : &c_;
 
     c_ *= Invert(GetRangeAdjustMatrix(to_.range_, to_.matrix_));
     *to_transfer_matrix *= GetTransferMatrix(to_.matrix_);
-    b_ *= Invert(GetPrimaryMatrix(to_.primaries_));
-    b_ *= GetPrimaryMatrix(from_.primaries_);
+    b_ *= Invert(GetPrimaryTransform(to_));
+    b_ *= GetPrimaryTransform(from_);
     *from_transfer_matrix *= Invert(GetTransferMatrix(from_.matrix_));
     a_ *= GetRangeAdjustMatrix(from_.range_, from_.matrix_);
   }
 
+  static Transform GetPrimaryTransform(const ColorSpace& c) {
+    if (c.primaries_ == ColorSpace::PrimaryID::CUSTOM) {
+      return Transform(c.custom_primary_matrix_[0], c.custom_primary_matrix_[1],
+                       c.custom_primary_matrix_[2], c.custom_primary_matrix_[3],
+                       c.custom_primary_matrix_[4], c.custom_primary_matrix_[5],
+                       c.custom_primary_matrix_[6], c.custom_primary_matrix_[7],
+                       c.custom_primary_matrix_[8], c.custom_primary_matrix_[9],
+                       c.custom_primary_matrix_[10],
+                       c.custom_primary_matrix_[11], 0.0f, 0.0f, 0.0f, 1.0f);
+    } else {
+      return GetPrimaryMatrix(c.primaries_);
+    }
+  }
+
   void transform(TriStim* colors, size_t num) override {
     for (size_t i = 0; i < num; i++) {
       TriStim c = colors[i];
       a_.TransformPoint(&c);
       c.set_x(ToLinear(from_.transfer_, c.x()));
       c.set_y(ToLinear(from_.transfer_, c.y()));
       c.set_z(ToLinear(from_.transfer_, c.z()));
       b_.TransformPoint(&c);
       c.set_x(FromLinear(to_.transfer_, c.x()));
       c.set_y(FromLinear(to_.transfer_, c.y()));
@@ skipping 107 matching lines @@
           std::unique_ptr<ColorTransform>(
               new QCMSColorTransform(GetXYZD50Profile(), to_profile))));
     } else {
       return std::unique_ptr<ColorTransform>(
           new ColorSpaceToColorSpaceTransform(from, to, intent));
     }
   }
 }
 
 }  // namespace gfx