Refactored SkColorSpace and added in a Lab PCS GM

dm/DMSrcSink.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 "DMSrcSink.h"
 #include "Resources.h"
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecImageGenerator.h"
 #include "SkColorSpace.h"
-#include "SkColorSpace_Base.h"
+#include "SkColorSpace_XYZ.h"
 #include "SkColorSpaceXform.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkDeferredCanvas.h"
 #include "SkDocument.h"
 #include "SkImageGenerator.h"
 #include "SkImageGeneratorCG.h"
 #include "SkImageGeneratorWIC.h"
 #include "SkLiteDL.h"
 #include "SkLiteRecorder.h"
@@ skipping 888 matching lines @@
         dstSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
     } else if (kDst_HPZR30w_Mode == fMode) {
         dstSpace = SkColorSpace::NewICC(dstData->data(), dstData->size());
     }
 
     SkImageInfo decodeInfo = codec->getInfo().makeColorType(fColorType).makeColorSpace(dstSpace);
     if (kUnpremul_SkAlphaType == decodeInfo.alphaType()) {
         decodeInfo = decodeInfo.makeAlphaType(kPremul_SkAlphaType);
     }
     if (kRGBA_F16_SkColorType == fColorType) {
-        decodeInfo = decodeInfo.makeColorSpace(as_CSB(decodeInfo.colorSpace())->makeLinearGamma());
+        SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(decodeInfo.colorSpace())->type());
+        SkColorSpace_XYZ* csXYZ = static_cast<SkColorSpace_XYZ*>(decodeInfo.colorSpace());
+        decodeInfo = decodeInfo.makeColorSpace(csXYZ->makeLinearGamma());
     }
 
     SkImageInfo bitmapInfo = decodeInfo;
     if (kRGBA_8888_SkColorType == decodeInfo.colorType() ||
         kBGRA_8888_SkColorType == decodeInfo.colorType())
     {
         bitmapInfo = bitmapInfo.makeColorType(kN32_SkColorType);
     }
 
     SkBitmap bitmap;
     if (!bitmap.tryAllocPixels(bitmapInfo)) {
         return SkStringPrintf("Image(%s) is too large (%d x %d)", fPath.c_str(),
                               bitmapInfo.width(), bitmapInfo.height());
     }
 
     size_t rowBytes = bitmap.rowBytes();
     SkCodec::Result r = codec->getPixels(decodeInfo, bitmap.getPixels(), rowBytes);
     if (SkCodec::kSuccess != r && SkCodec::kIncompleteInput != r) {
-        return SkStringPrintf("Couldn't getPixels %s. Error code %d", fPath.c_str(), r);
+        if (kRGBA_F16_SkColorType == decodeInfo.colorType()) {
+            // FIXME (raftias):
+            // Get the codecs to not fail when there is no color xform,
+            // which currently happens in F16 mode.
+            return Error::Nonfatal(SkStringPrintf("Couldn't getPixels %s in F16. Error code %d",
+                                                  fPath.c_str()));
+        } else {
+            return SkStringPrintf("Couldn't getPixels %s. Error code %d", fPath.c_str(), r);
+        }
     }
 
     switch (fMode) {
         case kBaseline_Mode:
         case kDst_sRGB_Mode:
         case kDst_HPZR30w_Mode:
             canvas->drawBitmap(bitmap, 0, 0);
             break;
 #if defined(SK_TEST_QCMS)
         case kQCMS_HPZR30w_Mode: {
@@ skipping 751 matching lines @@
         Error err = src.draw(&rec);
         if (!err.isEmpty()) {
             return err;
         }
         dl->draw(canvas);
         return check_against_reference(bitmap, src, fSink);
     });
 }
 
 }  // namespace DM