commit 8dc68c67f827b5b98e05946da251d0f2b2c27e98
author Brian Osman <brianosman@google.com> Wed May 30 12:57:45 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 30 17:37:49 2018 +0000
tree a5a08ed07409c9e0d951be5f6497338050bae520
parent 588f879677d4f36e16a42dd96876534f104c2e2f

Make skcms mandatory

Change-Id: I6b08cd586d313e3bc41c0da90698fc26ae1a8bb8
Reviewed-on: https://skia-review.googlesource.com/130822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index ffe01db..e111ecc 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -73,9 +73,7 @@
     #include "SkXMLWriter.h"
 #endif
 
-#if defined(SK_USE_SKCMS)
-    #include "skcms.h"
-#endif
+#include "../third_party/skcms/skcms.h"
 
 #if SK_SUPPORT_GPU
 #include "GrBackendSurface.h"
@@ -1090,14 +1088,10 @@
     if (kDst_sRGB_Mode == fMode) {
         dstSpace = SkColorSpace::MakeSRGB();
     } else if (kDst_HPZR30w_Mode == fMode) {
-#if defined(SK_USE_SKCMS)
         skcms_ICCProfile profile;
         SkAssertResult(skcms_Parse(dstData->data(), dstData->size(), &profile));
         dstSpace = SkColorSpace::Make(profile);
         SkASSERT(dstSpace);
-#else
-        return "Cannot use ICC profile without skcms support.";
-#endif
     }
 
     SkImageInfo decodeInfo = codec->getInfo().makeColorType(fColorType).makeColorSpace(dstSpace);