Refactored SkColorSpace and added in a Lab PCS GM

tools/visualize_color_gamut.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 "Resources.h"
 
 #include "SkBitmap.h"
@@ skipping 123 matching lines @@
     SkBitmap gamut;
     if (!GetResourceAsBitmap("gamut.png", &gamut)) {
         SkDebugf("Program failure.\n");
         return -1;
     }
     SkCanvas canvas(gamut);
 
     // Draw the sRGB gamut if requested.
     if (FLAGS_sRGB) {
         sk_sp<SkColorSpace> sRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
-        draw_gamut(&canvas, as_CSB(sRGBSpace)->toXYZD50(), "sRGB", 0xFFFF9394, false);
+        const SkMatrix44* mat = as_CSB(sRGBSpace)->requestToXYZD50();
+        SkASSERT(mat);
+        draw_gamut(&canvas, *mat, "sRGB", 0xFFFF9394, false);
     }
 
     // Draw the Adobe RGB gamut if requested.
     if (FLAGS_adobeRGB) {
         sk_sp<SkColorSpace> adobeRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named);
-        draw_gamut(&canvas, as_CSB(adobeRGBSpace)->toXYZD50(), "Adobe RGB", 0xFF31a9e1, false);
+        const SkMatrix44* mat = as_CSB(adobeRGBSpace)->requestToXYZD50();
+        SkASSERT(mat);
+        draw_gamut(&canvas, *mat, "Adobe RGB", 0xFF31a9e1, false);
     }
 
     // Draw gamut for the input image.
     sk_sp<SkColorSpace> colorSpace = sk_ref_sp(codec->getInfo().colorSpace());
     if (!colorSpace) {
         SkDebugf("Image had no embedded color space information.  Defaulting to sRGB.\n");
         colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
     }
-    draw_gamut(&canvas, as_CSB(colorSpace)->toXYZD50(), input, 0xFF000000, true);
+    const SkMatrix44* mat = as_CSB(colorSpace)->requestToXYZD50();
+    SkASSERT(mat);
+    draw_gamut(&canvas, *mat, input, 0xFF000000, true);
 
     // Finally, encode the result to the output file.
     sk_sp<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Type, 100));
     if (!out) {
         SkDebugf("Failed to encode gamut output.\n");
         return -1;
     }
     SkFILEWStream stream(output);
     bool result = stream.write(out->data(), out->size());
     if (!result) {
@@ skipping 22 matching lines @@
         SkFILEWStream bitmapStream(FLAGS_uncorrected[0]);
         result = bitmapStream.write(out->data(), out->size());
         if (!result) {
             SkDebugf("Failed to write uncorrected image output.\n");
             return -1;
         }
     }
 
     return 0;
 }