return 4x4 matrix from SkColorSpace

src/core/SkColorSpace.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkColorSpace_DEFINED
 #define SkColorSpace_DEFINED
 
 // Some terms
 //
 //  PCS : Profile Connection Space : where color number values have an absolute meaning.
 //        Part of the work float is to convert colors to and from this space...
 //        src_linear_unit_floats --> PCS --> PCS' --> dst_linear_unit_floats
 //
 // Some nice documents
 //
 // http://www.cambridgeincolour.com/tutorials/color-space-conversion.htm
 // https://www.w3.org/Graphics/Color/srgb
 // http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html
 //
 
 #include "SkRefCnt.h"
+#include "SkMatrix44.h"
 
 struct SkFloat3 {
     float fVec[3];
 
     void dump() const;
 };
 
-struct SkFloat3x3 {
-    float fMat[9];
-
-    void dump() const;
-};
-
 class SkColorSpace : public SkRefCnt {
 private:
     struct SkGammaCurve {
         bool isValue() const {
             bool result = (0.0f != fValue);
             SkASSERT(!result || (0 == fTableSize));
             return result;
         }
 
         bool isTable() const {
@@ skipping 62 matching lines @@
 
     private:
         SkGammaCurve fRed;
         SkGammaCurve fGreen;
         SkGammaCurve fBlue;
 
         friend class SkColorSpace;
     };
 
     /**
-     *  Return a colorspace instance, given a 3x3 transform from linear_RGB to D50_XYZ
+     *  Return a colorspace instance, given a transform from linear_RGB to D50_XYZ
      *  and the src-gamma, return a ColorSpace
      */
-    static sk_sp<SkColorSpace> NewRGB(const SkFloat3x3& toXYZD50, SkGammas gammas);
+    static sk_sp<SkColorSpace> NewRGB(const SkMatrix44& toXYZD50, SkGammas gammas);
 
     static sk_sp<SkColorSpace> NewNamed(Named);
     static sk_sp<SkColorSpace> NewICC(const void*, size_t);
 
     const SkGammas& gammas() const { return fGammas; }
-    SkFloat3x3 xyz() const { return fToXYZD50; }
-    SkFloat3 xyzOffset() const { return fToXYZOffset; }
+    SkMatrix44 xyz() const { return fToXYZD50; }
     Named named() const { return fNamed; }
     uint32_t uniqueID() const { return fUniqueID; }
 
 private:
 
     static bool LoadGammas(SkGammaCurve* gammas, uint32_t num, const uint8_t* src, size_t len);
 
 
     static bool LoadColorLUT(SkColorLookUpTable* colorLUT, uint32_t inputChannels,
                              uint32_t outputChannels, const uint8_t* src, size_t len);
 
 
-    static bool LoadA2B0(SkColorLookUpTable* colorLUT, SkGammas* gammas, SkFloat3x3* toXYZ,
-                         SkFloat3* toXYZOffset, const uint8_t* src, size_t len);
+    static bool LoadA2B0(SkColorLookUpTable* colorLUT, SkGammas* gammas, SkMatrix44* toXYZ,
+                         const uint8_t* src, size_t len);
 
-    SkColorSpace(SkGammas gammas, const SkFloat3x3& toXYZ, Named);
+    SkColorSpace(SkGammas gammas, const SkMatrix44& toXYZ, Named);
 
     SkColorSpace(SkColorLookUpTable colorLUT, SkGammas gammas,
-                 const SkFloat3x3& toXYZ, const SkFloat3& toXYZOffset);
+                 const SkMatrix44& toXYZ);
 
     const SkColorLookUpTable fColorLUT;
     const SkGammas           fGammas;
-    const SkFloat3x3         fToXYZD50;
-    const SkFloat3           fToXYZOffset;
+    const SkMatrix44         fToXYZD50;
 
     const uint32_t           fUniqueID;
     const Named              fNamed;
 };
 
 #endif