diff options
author | Ravi Mistry <rmistry@google.com> | 2016-12-17 01:26:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-17 01:27:10 +0000 |
commit | eb733fbf56538838a36814c75cd03f917462cb22 (patch) | |
tree | 2ac19e158200809964bffad6d5ca1794c84c4d8f /tests/ICCTest.cpp | |
parent | 2ee084e73056b0ad76b721017f576168b7306da3 (diff) |
Revert "WIP: Skia support library for ICC tasks"
This reverts commit fc8dc3194acb959ee5980b41766660ca0644bcab.
Reason for revert: Breaks Build-Mac-Clang-Arm7-{Debug,Release}-iOS builds.
Example tasks:
* https://chromium-swarm.appspot.com/task?id=3322f668620b9e10&refresh=10
* https://chromium-swarm.appspot.com/task?id=332296146331e810&refresh=10
Original change's description:
> WIP: Skia support library for ICC tasks
>
> As a starting point, this would be mostly trivial to implement using
> SkColorSpace.
>
> This also would give us the flexibility to begin to move all of
> the ICC related code from SkColorSpace to SkICC.
>
> What are the advantages of moving this away from SkColorSpace?
> (1) A long term goal (once Chrome uses SkCodec), might be to
> move SkColorSpace::MakeICC() out of the public API. That way,
> we can guarantee that we can draw to/from *any* SkColorSpace.
> (2) Keeps SkColorSpace separate from ICC-specific representations
> like SkColorSpaceTransferFn etc.
>
> BUG=skia:
>
> Change-Id: Iddeb9903221fb57fbfc01218d8641c928b4a5165
> Reviewed-on: https://skia-review.googlesource.com/5676
> Commit-Queue: Matt Sarett <msarett@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ibdf272fce25892402bd3e85595fb8814cdf59856
Reviewed-on: https://skia-review.googlesource.com/6232
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'tests/ICCTest.cpp')
-rw-r--r-- | tests/ICCTest.cpp | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp deleted file mode 100644 index f4639f0003..0000000000 --- a/tests/ICCTest.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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 "SkColorSpace.h" -#include "SkData.h" -#include "SkICC.h" -#include "SkMatrix44.h" -#include "Test.h" - -static bool almost_equal(float a, float b) { - return SkTAbs(a - b) < 0.001f; -} - -static inline void test_to_xyz_d50(skiatest::Reporter* r, SkICC* icc, bool shouldSucceed, - const float* reference) { - SkMatrix44 result; - REPORTER_ASSERT(r, shouldSucceed == icc->toXYZD50(&result)); - if (shouldSucceed) { - float resultVals[16]; - result.asColMajorf(resultVals); - for (int i = 0; i < 16; i++) { - REPORTER_ASSERT(r, almost_equal(resultVals[i], reference[i])); - } - } -} - -DEF_TEST(ICC_ToXYZD50, r) { - const float z30Reference[16] = { - 0.59825f, 0.27103f, 0.00603f, 0.0f, 0.22243f, 0.67447f, 0.07368f, 0.0f, 0.14352f, 0.05449f, - 0.74519f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, - }; - - sk_sp<SkData> data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); - sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size()); - test_to_xyz_d50(r, z30.get(), true, z30Reference); - - const float z32Reference[16] = { - 0.61583f, 0.28789f, 0.00513f, 0.0f, 0.20428f, 0.66972f, 0.06609f, 0.0f, 0.14409f, 0.04237f, - 0.75368f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, - }; - - data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); - sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size()); - test_to_xyz_d50(r, z32.get(), true, z32Reference); - - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); - sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size()); - test_to_xyz_d50(r, upperLeft.get(), false, z32Reference); - - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); - sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size()); - test_to_xyz_d50(r, upperRight.get(), false, z32Reference); -} - -static inline void test_is_numerical_transfer_fn(skiatest::Reporter* r, SkICC* icc, - bool shouldSucceed, - const SkColorSpaceTransferFn& reference) { - SkColorSpaceTransferFn result; - REPORTER_ASSERT(r, shouldSucceed == icc->isNumericalTransferFn(&result)); - if (shouldSucceed) { - REPORTER_ASSERT(r, 0 == memcmp(&result, &reference, sizeof(SkColorSpaceTransferFn))); - } -} - -DEF_TEST(ICC_IsNumericalTransferFn, r) { - SkColorSpaceTransferFn referenceFn; - referenceFn.fA = 1.0f; - referenceFn.fB = 0.0f; - referenceFn.fC = 0.0f; - referenceFn.fD = 0.0f; - referenceFn.fE = 0.0f; - referenceFn.fF = 0.0f; - referenceFn.fG = 2.2f; - - sk_sp<SkData> data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); - sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size()); - test_is_numerical_transfer_fn(r, z30.get(), true, referenceFn); - - data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); - sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size()); - test_is_numerical_transfer_fn(r, z32.get(), true, referenceFn); - - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); - sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size()); - test_is_numerical_transfer_fn(r, upperLeft.get(), false, referenceFn); - - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); - sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size()); - test_is_numerical_transfer_fn(r, upperRight.get(), false, referenceFn); -} |