From 8dc68c67f827b5b98e05946da251d0f2b2c27e98 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Wed, 30 May 2018 12:57:45 -0400
Subject: 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>
---
 tests/ColorSpaceTest.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'tests/ColorSpaceTest.cpp')

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
-- 
cgit v1.2.3