SkMatrix44 clarifications and clean-ups

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 212 matching lines @@
         // FIXME (msarett): Here we are treating XYZ values as D50 even though the color
         //                  temperature is unspecified.  I suspect that this assumption
         //                  is most often ok, but we could also calculate the color
         //                  temperature (D value) and then convert the XYZ to D50.  Maybe
         //                  we should add a new constructor to SkColorSpace that accepts
         //                  XYZ with D-Unkown?
         for (int i = 0; i < 9; i++) {
             toXYZD50[i] = png_fixed_point_to_float(XYZ[i]);
         }
         SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
-        mat.set3x3ColMajorf(toXYZD50);
+        mat.set3x3RowMajorf(toXYZD50);
 
         if (PNG_INFO_gAMA == png_get_gAMA_fixed(png_ptr, info_ptr, &gamma)) {
             float value = png_inverted_fixed_point_to_float(gamma);
             gammas[0] = value;
             gammas[1] = value;
             gammas[2] = value;
 
             return SkColorSpace_Base::NewRGB(gammas, mat);
         }
 
         // Default to sRGB gamma if the image has color space information,
         // but does not specify gamma.
         return SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed, mat);
     }
 
     // Last, check for gamma.
     if (PNG_INFO_gAMA == png_get_gAMA_fixed(png_ptr, info_ptr, &gamma)) {
 
         // Set the gammas.
         float value = png_inverted_fixed_point_to_float(gamma);
         gammas[0] = value;
         gammas[1] = value;
         gammas[2] = value;
 
         // Since there is no cHRM, we will guess sRGB gamut.
         SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
-        mat.set3x3ColMajorf(gSRGB_toXYZD50);
+        mat.set3x3RowMajorf(gSRGB_toXYZD50);
 
         return SkColorSpace_Base::NewRGB(gammas, mat);
     }
 
 #endif // LIBPNG >= 1.6
 
     // Report that there is no color space information in the PNG.  SkPngCodec is currently
     // implemented to guess sRGB in this case.
     return nullptr;
 }
@@ skipping 538 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;
 }