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>

2 files changed, 49 insertions, 66 deletions

diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 9324e8cf04..c8d6a06e66 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -18,10 +18,7 @@
 #include "SkTypes.h"
 #include "Test.h"
 #include "png.h"
-
-#if defined(SK_USE_SKCMS)
-#include "skcms.h"
-#endif
+#include "../third_party/skcms/skcms.h"
 
 #include <memory>
 #include <utility>
@@ -208,7 +205,6 @@ DEF_TEST(ColorSpace_Serialize, r) {
     test_serialize(r, SkColorSpace::MakeSRGB(), true);
     test_serialize(r, SkColorSpace::MakeSRGBLinear(), true);
 
-#if defined(SK_USE_SKCMS)
     auto test = [&](const char* path) {
         sk_sp<SkData> data = GetResourceAsData(path);
 
@@ -222,7 +218,6 @@ DEF_TEST(ColorSpace_Serialize, r) {
     };
     test("icc_profiles/HP_ZR30w.icc");
     test("icc_profiles/HP_Z32x.icc");
-#endif
 
     SkColorSpaceTransferFn fn;
     fn.fA = 1.0f;
@@ -239,7 +234,6 @@ DEF_TEST(ColorSpace_Serialize, r) {
 DEF_TEST(ColorSpace_Equals, r) {
     sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB();
 
-#if defined(SK_USE_SKCMS)
     auto parse = [&](const char* path) {
         sk_sp<SkData> data = GetResourceAsData(path);
 
@@ -253,7 +247,6 @@ DEF_TEST(ColorSpace_Equals, r) {
     };
     sk_sp<SkColorSpace> z30 = parse("icc_profiles/HP_ZR30w.icc");
     sk_sp<SkColorSpace> z32 = parse("icc_profiles/HP_Z32x.icc");
-#endif
 
     SkColorSpaceTransferFn fn;
     fn.fA = 1.0f;
@@ -268,19 +261,15 @@ DEF_TEST(ColorSpace_Equals, r) {
 
     REPORTER_ASSERT(r, SkColorSpace::Equals(nullptr, nullptr));
     REPORTER_ASSERT(r, SkColorSpace::Equals(srgb.get(), srgb.get()));
-#if defined(SK_USE_SKCMS)
     REPORTER_ASSERT(r, SkColorSpace::Equals(z30.get(), z30.get()));
     REPORTER_ASSERT(r, SkColorSpace::Equals(z32.get(), z32.get()));
-#endif
     REPORTER_ASSERT(r, SkColorSpace::Equals(rgb4.get(), rgb4.get()));
 
     REPORTER_ASSERT(r, !SkColorSpace::Equals(nullptr, srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), nullptr));
-#if defined(SK_USE_SKCMS)
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z32.get(), z30.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), rgb4.get()));
-#endif
     REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), rgb4.get()));
 }
 
@@ -431,9 +420,7 @@ DEF_TEST(ColorSpace_IsSRGB, r) {
     REPORTER_ASSERT(r, !twoDotTwo->isSRGB());
 }
 
-#if defined(SK_USE_SKCMS)
 DEF_TEST(ColorSpace_skcms_IsSRGB, r) {
     sk_sp<SkColorSpace> srgb = SkColorSpace::Make(*skcms_sRGB_profile());
     REPORTER_ASSERT(r, srgb->isSRGB());
 }
-#endif
diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index e88255b2cd..d8f5a35fdb 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -7,67 +7,63 @@
 
 #include "SkTypes.h"
 
-#if defined(SK_USE_SKCMS)
+#include "Resources.h"
+#include "SkColorSpacePriv.h"
+#include "SkICC.h"
+#include "SkString.h"
+#include "Test.h"
+#include "../third_party/skcms/skcms.h"
 
-    #include "Resources.h"
-    #include "SkColorSpacePriv.h"
-    #include "SkICC.h"
-    #include "SkString.h"
-    #include "Test.h"
-    #include "skcms.h"
+DEF_TEST(WriteICCProfile, r) {
+    auto adobeRGB = SkColorSpace::MakeRGB(g2Dot2_TransferFn, SkColorSpace::kAdobeRGB_Gamut);
 
-    DEF_TEST(WriteICCProfile, r) {
-        auto adobeRGB = SkColorSpace::MakeRGB(g2Dot2_TransferFn, SkColorSpace::kAdobeRGB_Gamut);
+    struct {
+        SkColorSpaceTransferFn fn;
+        const float*           toXYZD50;
+        const char*            desc;
+        sk_sp<SkColorSpace>    want;
+    } tests[] = {
+        {g2Dot2_TransferFn, gAdobeRGB_toXYZD50, "AdobeRGB", adobeRGB},
+        { gSRGB_TransferFn,     gSRGB_toXYZD50,     "sRGB", SkColorSpace::MakeSRGB()},
+    };
 
-        struct {
-            SkColorSpaceTransferFn fn;
-            const float*           toXYZD50;
-            const char*            desc;
-            sk_sp<SkColorSpace>    want;
-        } tests[] = {
-            {g2Dot2_TransferFn, gAdobeRGB_toXYZD50, "AdobeRGB", adobeRGB},
-            { gSRGB_TransferFn,     gSRGB_toXYZD50,     "sRGB", SkColorSpace::MakeSRGB()},
-        };
+    for (auto test : tests) {
+        sk_sp<SkData> profile = SkWriteICCProfile(test.fn, test.toXYZD50);
+        REPORTER_ASSERT(r, profile);
 
-        for (auto test : tests) {
-            sk_sp<SkData> profile = SkWriteICCProfile(test.fn, test.toXYZD50);
-            REPORTER_ASSERT(r, profile);
+        skcms_ICCProfile parsed;
+        REPORTER_ASSERT(r, skcms_Parse(profile->data(), profile->size(), &parsed));
 
-            skcms_ICCProfile parsed;
-            REPORTER_ASSERT(r, skcms_Parse(profile->data(), profile->size(), &parsed));
+        sk_sp<SkColorSpace> got = SkColorSpace::Make(parsed);
+        REPORTER_ASSERT(r, got);
+        REPORTER_ASSERT(r, SkColorSpace::Equals(got.get(), test.want.get()));
 
-            sk_sp<SkColorSpace> got = SkColorSpace::Make(parsed);
-            REPORTER_ASSERT(r, got);
-            REPORTER_ASSERT(r, SkColorSpace::Equals(got.get(), test.want.get()));
+        skcms_ICCTag desc;
+        REPORTER_ASSERT(r, skcms_GetTagBySignature(&parsed,
+                                                   SkSetFourByteTag('d','e','s','c'),
+                                                   &desc));
 
-            skcms_ICCTag desc;
-            REPORTER_ASSERT(r, skcms_GetTagBySignature(&parsed,
-                                                       SkSetFourByteTag('d','e','s','c'),
-                                                       &desc));
-
-            // Rather than really carefully break down the 'desc' tag,
-            // just check our expected description is somewhere in there (as big-endian UTF-16).
-            uint8_t big_endian_utf16[16];
-            for (size_t i = 0; i < strlen(test.desc); i++) {
-                big_endian_utf16[2*i+0] = 0;
-                big_endian_utf16[2*i+1] = test.desc[i];
-            }
-
-            SkString haystack((const char*)desc.buf, desc.size),
-                     needle  ((const char*)big_endian_utf16, 2*strlen(test.desc));
-            REPORTER_ASSERT(r, haystack.contains(needle.c_str()));
+        // Rather than really carefully break down the 'desc' tag,
+        // just check our expected description is somewhere in there (as big-endian UTF-16).
+        uint8_t big_endian_utf16[16];
+        for (size_t i = 0; i < strlen(test.desc); i++) {
+            big_endian_utf16[2*i+0] = 0;
+            big_endian_utf16[2*i+1] = test.desc[i];
         }
+
+        SkString haystack((const char*)desc.buf, desc.size),
+                 needle  ((const char*)big_endian_utf16, 2*strlen(test.desc));
+        REPORTER_ASSERT(r, haystack.contains(needle.c_str()));
     }
+}
 
-    DEF_TEST(AdobeRGB, r) {
-        if (sk_sp<SkData> profile = GetResourceAsData("icc_profiles/AdobeRGB1998.icc")) {
-            skcms_ICCProfile parsed;
-            REPORTER_ASSERT(r, skcms_Parse(profile->data(), profile->size(), &parsed));
+DEF_TEST(AdobeRGB, r) {
+    if (sk_sp<SkData> profile = GetResourceAsData("icc_profiles/AdobeRGB1998.icc")) {
+        skcms_ICCProfile parsed;
+        REPORTER_ASSERT(r, skcms_Parse(profile->data(), profile->size(), &parsed));
 
-            auto got  = SkColorSpace::Make(parsed);
-            auto want = SkColorSpace::MakeRGB(g2Dot2_TransferFn, SkColorSpace::kAdobeRGB_Gamut);
-            REPORTER_ASSERT(r, SkColorSpace::Equals(got.get(), want.get()));
-        }
+        auto got  = SkColorSpace::Make(parsed);
+        auto want = SkColorSpace::MakeRGB(g2Dot2_TransferFn, SkColorSpace::kAdobeRGB_Gamut);
+        REPORTER_ASSERT(r, SkColorSpace::Equals(got.get(), want.get()));
     }
-
-#endif
+}