Fix storage of gamut transform matrices in SkColorSpace

src/codec/SkPngCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 177 matching lines @@
     // fixed point -> double -> float.
     return ((float) x) * 0.00001f;
 }
 
 static float png_inverted_fixed_point_to_float(png_fixed_point x) {
     // This is necessary because the gAMA chunk actually stores 1/gamma.
     return 1.0f / png_fixed_point_to_float(x);
 }
 
 static constexpr float gSRGB_toXYZD50[] {
-    0.4358f, 0.2224f, 0.0139f,    // * R
-    0.3853f, 0.7170f, 0.0971f,    // * G
-    0.1430f, 0.0606f, 0.7139f,    // * B
+    0.4358f, 0.3853f, 0.1430f,    // Rx, Gx, Bx
+    0.2224f, 0.7170f, 0.0606f,    // Ry, Gy, Gz
+    0.0139f, 0.0971f, 0.7139f,    // Rz, Gz, Bz
 };
 
 static bool convert_to_D50(SkMatrix44* toXYZD50, float toXYZ[9], float whitePoint[2]) {
     float wX = whitePoint[0];
     float wY = whitePoint[1];
     if (wX < 0.0f || wY < 0.0f || (wX + wY > 1.0f)) {
         return false;
     }
 
     // Calculate the XYZ illuminant.  Call this the src illuminant.
@@ skipping 33 matching lines @@
     DXToD50[4] = dstCone.fY / srcCone.fY;
     DXToD50[8] = dstCone.fZ / srcCone.fZ;
     DXToD50.postConcat(mAInv);
     DXToD50.preConcat(mA);
 
     SkMatrix toXYZ3x3;
     toXYZ3x3.setAll(toXYZ[0], toXYZ[3], toXYZ[6], toXYZ[1], toXYZ[4], toXYZ[7], toXYZ[2], toXYZ[5],
                     toXYZ[8]);
     toXYZ3x3.postConcat(DXToD50);
 
-    toXYZD50->set3x3(toXYZ3x3[0], toXYZ3x3[1], toXYZ3x3[2], toXYZ3x3[3], toXYZ3x3[4], toXYZ3x3[5],
-                     toXYZ3x3[6], toXYZ3x3[7], toXYZ3x3[8]);
+    toXYZD50->set3x3(toXYZ3x3[0], toXYZ3x3[3], toXYZ3x3[6],
+                     toXYZ3x3[1], toXYZ3x3[4], toXYZ3x3[7],
+                     toXYZ3x3[2], toXYZ3x3[5], toXYZ3x3[8]);
     return true;
 }
 
 // Returns a colorSpace object that represents any color space information in
 // the encoded data.  If the encoded data contains no color space, this will
 // return NULL.
 sk_sp<SkColorSpace> read_color_space(png_structp png_ptr, png_infop info_ptr) {
 
 #if (PNG_LIBPNG_VER_MAJOR > 1) || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 6)
 
@@ skipping 675 matching lines @@
     SkCodec* outCodec;
     if (read_header(stream, chunkReader, &outCodec, nullptr, nullptr)) {
         // Codec has taken ownership of the stream.
         SkASSERT(outCodec);
         streamDeleter.release();
         return outCodec;
     }
 
     return nullptr;
 }