Miscellaneous color space refactors

src/core/SkColorSpaceXform.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 "SkColorPriv.h"
 #include "SkColorSpace_Base.h"
 #include "SkColorSpaceXform.h"
@@ skipping 472 matching lines @@
                         new SkFastXform<SkColorSpace::kNonStandard_GammaNamed>(srcSpace, srcToDst,
                                                                                dstSpace));
         }
     }
 
     return std::unique_ptr<SkColorSpaceXform>(new SkDefaultXform(srcSpace, srcToDst, dstSpace));
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-// TODO (msarett):
-// Once SkFastXform supports translation, delete this function and use asRowMajorf().
-static void build_src_to_dst(float srcToDstArray[12], const SkMatrix44& srcToDstMatrix) {
-    // Build the following row major matrix:
-    //   rX gX bX 0
-    //   rY gY bY 0
-    //   rZ gZ bZ 0
-    srcToDstArray[0] = srcToDstMatrix.getFloat(0, 0);
-    srcToDstArray[1] = srcToDstMatrix.getFloat(0, 1);
-    srcToDstArray[2] = srcToDstMatrix.getFloat(0, 2);
-    srcToDstArray[3] = 0.0f;
-    srcToDstArray[4] = srcToDstMatrix.getFloat(1, 0);
-    srcToDstArray[5] = srcToDstMatrix.getFloat(1, 1);
-    srcToDstArray[6] = srcToDstMatrix.getFloat(1, 2);
-    srcToDstArray[7] = 0.0f;
-    srcToDstArray[8] = srcToDstMatrix.getFloat(2, 0);
-    srcToDstArray[9] = srcToDstMatrix.getFloat(2, 1);
-    srcToDstArray[10] = srcToDstMatrix.getFloat(2, 2);
-    srcToDstArray[11] = 0.0f;
-}
-
 template <SkColorSpace::GammaNamed Dst>
 SkFastXform<Dst>::SkFastXform(const sk_sp<SkColorSpace>& srcSpace, const SkMatrix44& srcToDst,
                               const sk_sp<SkColorSpace>& dstSpace)
 {
-    build_src_to_dst(fSrcToDst, srcToDst);
+    srcToDst.asRowMajorf(fSrcToDst);
     build_gamma_tables(fSrcGammaTables, fSrcGammaTableStorage, 256, srcSpace, kToLinear);
     build_gamma_tables(fDstGammaTables, fDstGammaTableStorage, SkDefaultXform::kDstGammaTableSize,
                        dstSpace, kFromLinear);
 }
 
 template <>
 void SkFastXform<SkColorSpace::kSRGB_GammaNamed>
 ::applyTo8888(SkPMColor* dst, const RGBA32* src, int len) const
 {
     SkOpts::color_xform_RGB1_to_srgb(dst, src, len, fSrcGammaTables, fSrcToDst);
@@ skipping 79 matching lines @@
     const int n000 = 0;
     const int n001 = 3 * colorLUT->fGridPoints[1] * colorLUT->fGridPoints[2];
     const int n010 = 3 * colorLUT->fGridPoints[2];
     const int n011 = n001 + n010;
     const int n100 = 3;
     const int n101 = n100 + n001;
     const int n110 = n100 + n010;
     const int n111 = n110 + n001;
 
     // Base ptr into the table.
-    float* ptr = &colorLUT->fTable[ix*n001 + iy*n010 + iz*n100];
+    const float* ptr = &(colorLUT->table()[ix*n001 + iy*n010 + iz*n100]);
 
     // The code below performs a tetrahedral interpolation for each of the three
     // dst components.  Once the tetrahedron containing the interpolation point is
     // identified, the interpolation is a weighted sum of grid values at the
     // vertices of the tetrahedron.  The claim is that tetrahedral interpolation
     // provides a more accurate color conversion.
     // blogs.mathworks.com/steve/2006/11/24/tetrahedral-interpolation-for-colorspace-conversion/
     //
     // I have one test image, and visually I can't tell the difference between
     // tetrahedral and trilinear interpolation.  In terms of computation, the
@@ skipping 93 matching lines @@
         dst++;
         src++;
     }
 }
 
 void SkDefaultXform::applyToF16(RGBAF16* dst, const RGBA32* src, int len) const {
     // FIXME (msarett):
     // Planning to delete SkDefaultXform.  Not going to bother to implement this.
     memset(dst, 0, len * sizeof(RGBAF16));
 }