return 4x4 matrix from SkColorSpace

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"
 
 void SkFloat3::dump() const {
     SkDebugf("[%7.4f %7.4f %7.4f]\n", fVec[0], fVec[1], fVec[2]);
 }
 
-void SkFloat3x3::dump() const {
-    SkDebugf("[%7.4f %7.4f %7.4f] [%7.4f %7.4f %7.4f] [%7.4f %7.4f %7.4f]\n",
-             fMat[0], fMat[1], fMat[2],
-             fMat[3], fMat[4], fMat[5],
-             fMat[6], fMat[7], fMat[8]);
-}
-
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 static int32_t gUniqueColorSpaceID;
 
-SkColorSpace::SkColorSpace(const SkFloat3& gamma, const SkFloat3x3& toXYZD50, Named named)
+SkColorSpace::SkColorSpace(const SkFloat3& gamma, const SkMatrix44& toXYZD50, Named named)
     : fGamma(gamma)
     , fToXYZD50(toXYZD50)
-    , fToXYZOffset({{ 0.0f, 0.0f, 0.0f }})
     , fUniqueID(sk_atomic_inc(&gUniqueColorSpaceID))
     , fNamed(named)
 {}
 
 SkColorSpace::SkColorSpace(SkColorLookUpTable colorLUT, const SkFloat3& gamma,
-                           const SkFloat3x3& toXYZD50, const SkFloat3& toXYZOffset)
+                           const SkMatrix44& toXYZD50)
     : fColorLUT(std::move(colorLUT))
     , fGamma(gamma)
     , fToXYZD50(toXYZD50)
-    , fToXYZOffset(toXYZOffset)
     , fUniqueID(sk_atomic_inc(&gUniqueColorSpaceID))
     , fNamed(kUnknown_Named)
 {}
 
-sk_sp<SkColorSpace> SkColorSpace::NewRGB(const SkFloat3x3& toXYZD50, const SkFloat3& gamma) {
+sk_sp<SkColorSpace> SkColorSpace::NewRGB(const SkMatrix44& toXYZD50, const SkFloat3& gamma) {
     return sk_sp<SkColorSpace>(new SkColorSpace(gamma, toXYZD50, kUnknown_Named));
 }
 
 const SkFloat3 gSRGB_gamma {{ 2.2f, 2.2f, 2.2f }};
-const SkFloat3x3 gSRGB_toXYZD50 {{
+const float gSRGB_toXYZD50[9] {
     0.4358f, 0.2224f, 0.0139f,    // * R
     0.3853f, 0.7170f, 0.0971f,    // * G
     0.1430f, 0.0606f, 0.7139f,    // * B
-}};
+};
 
 sk_sp<SkColorSpace> SkColorSpace::NewNamed(Named named) {
     switch (named) {
-        case kSRGB_Named:
-            return sk_sp<SkColorSpace>(new SkColorSpace(gSRGB_gamma, gSRGB_toXYZD50, kSRGB_Named));
+        case kSRGB_Named: {
+            SkMatrix44 srgbToxyzD50(SkMatrix44::kUninitialized_Constructor);
+            srgbToxyzD50.set3x3ColMajorf(gSRGB_toXYZD50);
+            return sk_sp<SkColorSpace>(new SkColorSpace(gSRGB_gamma, srgbToxyzD50, kSRGB_Named));
+        }
         default:
             break;
     }
     return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "SkFixed.h"
 #include "SkTemplates.h"
@@ skipping 344 matching lines @@
         if (1 == precision) {
             colorLUT->fTable[i] = ((float) ptr[i]) / 255.0f;
         } else {
             colorLUT->fTable[i] = ((float) read_big_endian_short(ptr)) / 65535.0f;
         }
     }
 
     return true;
 }
 
-bool load_matrix(SkFloat3x3* toXYZ, SkFloat3* toXYZOffset, const uint8_t* src, size_t len) {
+bool load_matrix(SkMatrix44* toXYZ, const uint8_t* src, size_t len) {
     if (len < 48) {
         SkColorSpacePrintf("Matrix tag is too small (%d bytes).", len);
         return false;
     }
 
-    toXYZ->fMat[0] = SkFixedToFloat(read_big_endian_int(src));
-    toXYZ->fMat[3] = SkFixedToFloat(read_big_endian_int(src + 4));
-    toXYZ->fMat[6] = SkFixedToFloat(read_big_endian_int(src + 8));
-    toXYZ->fMat[1] = SkFixedToFloat(read_big_endian_int(src + 12));
-    toXYZ->fMat[4] = SkFixedToFloat(read_big_endian_int(src + 16));
-    toXYZ->fMat[7] = SkFixedToFloat(read_big_endian_int(src + 20));
-    toXYZ->fMat[2] = SkFixedToFloat(read_big_endian_int(src + 24));
-    toXYZ->fMat[5] = SkFixedToFloat(read_big_endian_int(src + 28));
-    toXYZ->fMat[8] = SkFixedToFloat(read_big_endian_int(src + 32));
-    toXYZOffset->fVec[0] = SkFixedToFloat(read_big_endian_int(src + 36));
-    toXYZOffset->fVec[1] = SkFixedToFloat(read_big_endian_int(src + 40));
-    toXYZOffset->fVec[2] = SkFixedToFloat(read_big_endian_int(src + 44));
+    float array[16];
+    array[ 0] = SkFixedToFloat(read_big_endian_int(src));
+    array[ 1] = SkFixedToFloat(read_big_endian_int(src + 4));
+    array[ 2] = SkFixedToFloat(read_big_endian_int(src + 8));
+    array[ 3] = 0;
+    array[ 4] = SkFixedToFloat(read_big_endian_int(src + 12));
+    array[ 5] = SkFixedToFloat(read_big_endian_int(src + 16));
+    array[ 6] = SkFixedToFloat(read_big_endian_int(src + 20));
+    array[ 7] = 0;
+    array[ 8] = SkFixedToFloat(read_big_endian_int(src + 24));
+    array[ 9] = SkFixedToFloat(read_big_endian_int(src + 28));
+    array[10] = SkFixedToFloat(read_big_endian_int(src + 32));
+    array[11] = 0;
+    array[12] = SkFixedToFloat(read_big_endian_int(src + 36));  // translate R
+    array[13] = SkFixedToFloat(read_big_endian_int(src + 40));  // translate G
+    array[14] = SkFixedToFloat(read_big_endian_int(src + 44));
+    array[15] = 1;
+    toXYZ->setColMajorf(array);
     return true;
 }
 
-bool load_a2b0(SkColorLookUpTable* colorLUT, SkFloat3* gamma, SkFloat3x3* toXYZ,
-        SkFloat3* toXYZOffset, const uint8_t* src, size_t len) {
+bool load_a2b0(SkColorLookUpTable* colorLUT, SkFloat3* gamma, SkMatrix44* toXYZ,
+               const uint8_t* src, size_t len) {
     if (len < 32) {
         SkColorSpacePrintf("A to B tag is too small (%d bytes).", len);
         return false;
     }
 
     uint32_t type = read_big_endian_uint(src);
     if (kTAG_AtoBType != type) {
         // FIXME (msarett): Need to support lut8Type and lut16Type.
         SkColorSpacePrintf("Unsupported A to B tag type.\n");
         return false;
@@ skipping 36 matching lines @@
     uint32_t offsetToMCurves = read_big_endian_int(src + 20);
     if (0 != offsetToMCurves && offsetToMCurves < len) {
         if (!load_gammas(gamma->fVec, outputChannels, src + offsetToMCurves, len - offsetToMCurves))
         {
             SkColorSpacePrintf("Failed to read M curves from A to B tag.\n");
         }
     }
 
     uint32_t offsetToMatrix = read_big_endian_int(src + 16);
     if (0 != offsetToMatrix && offsetToMatrix < len) {
-        if (!load_matrix(toXYZ, toXYZOffset, src + offsetToMatrix, len - offsetToMatrix)) {
+        if (!load_matrix(toXYZ, src + offsetToMatrix, len - offsetToMatrix)) {
             SkColorSpacePrintf("Failed to read matrix from A to B tag.\n");
         }
     }
 
     return true;
 }
 
 sk_sp<SkColorSpace> SkColorSpace::NewICC(const void* base, size_t len) {
     const uint8_t* ptr = (const uint8_t*) base;
 
@@ skipping 37 matching lines @@
         }
     }
 
     switch (header.fInputColorSpace) {
         case kRGB_ColorSpace: {
             // Recognize the rXYZ, gXYZ, and bXYZ tags.
             const ICCTag* r = ICCTag::Find(tags.get(), tagCount, kTAG_rXYZ);
             const ICCTag* g = ICCTag::Find(tags.get(), tagCount, kTAG_gXYZ);
             const ICCTag* b = ICCTag::Find(tags.get(), tagCount, kTAG_bXYZ);
             if (r && g && b) {
-                SkFloat3x3 toXYZ;
-                if (!load_xyz(&toXYZ.fMat[0], r->addr((const uint8_t*) base), r->fLength) ||
-                    !load_xyz(&toXYZ.fMat[3], g->addr((const uint8_t*) base), g->fLength) ||
-                    !load_xyz(&toXYZ.fMat[6], b->addr((const uint8_t*) base), b->fLength))
+                float toXYZ[9];
+                if (!load_xyz(&toXYZ[0], r->addr((const uint8_t*) base), r->fLength) ||
+                    !load_xyz(&toXYZ[3], g->addr((const uint8_t*) base), g->fLength) ||
+                    !load_xyz(&toXYZ[6], b->addr((const uint8_t*) base), b->fLength))
                 {
                     return_null("Need valid rgb tags for XYZ space");
                 }
 
                 // It is not uncommon to see missing or empty gamma tags.  This indicates
                 // that we should use unit gamma.
                 SkFloat3 gamma {{ 1.0f, 1.0f, 1.0f }};
                 r = ICCTag::Find(tags.get(), tagCount, kTAG_rTRC);
                 g = ICCTag::Find(tags.get(), tagCount, kTAG_gTRC);
                 b = ICCTag::Find(tags.get(), tagCount, kTAG_bTRC);
                 if (!r ||
                     !load_gammas(&gamma.fVec[0], 1, r->addr((const uint8_t*) base), r->fLength))
                 {
                     SkColorSpacePrintf("Failed to read R gamma tag.\n");
                 }
                 if (!g ||
                     !load_gammas(&gamma.fVec[1], 1, g->addr((const uint8_t*) base), g->fLength))
                 {
                     SkColorSpacePrintf("Failed to read G gamma tag.\n");
                 }
                 if (!b ||
                     !load_gammas(&gamma.fVec[2], 1, b->addr((const uint8_t*) base), b->fLength))
                 {
                     SkColorSpacePrintf("Failed to read B gamma tag.\n");
                 }
-                return SkColorSpace::NewRGB(toXYZ, gamma);
+
+                SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
+                mat.set3x3ColMajorf(toXYZ);
+                return SkColorSpace::NewRGB(mat, gamma);
             }
 
             // Recognize color profile specified by A2B0 tag.
             const ICCTag* a2b0 = ICCTag::Find(tags.get(), tagCount, kTAG_A2B0);
             if (a2b0) {
                 SkColorLookUpTable colorLUT;
                 SkFloat3 gamma;
-                SkFloat3x3 toXYZ;
-                SkFloat3 toXYZOffset;
-                if (!load_a2b0(&colorLUT, &gamma, &toXYZ, &toXYZOffset,
-                        a2b0->addr((const uint8_t*) base), a2b0->fLength)) {
+                SkMatrix44 toXYZ(SkMatrix44::kUninitialized_Constructor);
+                if (!load_a2b0(&colorLUT, &gamma, &toXYZ, a2b0->addr((const uint8_t*) base),
+                               a2b0->fLength)) {
                     return_null("Failed to parse A2B0 tag");
                 }
 
-                return sk_sp<SkColorSpace>(new SkColorSpace(std::move(colorLUT), gamma, toXYZ,
-                                                            toXYZOffset));
+                return sk_sp<SkColorSpace>(new SkColorSpace(std::move(colorLUT), gamma, toXYZ));
             }
 
         }
         default:
             break;
     }
 
     return_null("ICC profile contains unsupported colorspace");
 }