diff options
author | mtklein <mtklein@google.com> | 2016-07-07 18:34:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-07 18:34:06 -0700 |
commit | e930459a18ea099859f7d0076802458be00a6b4c (patch) | |
tree | 41c49d75d3ef566cccd7a890c3de765ccd027808 /tests | |
parent | ea5a6513c05e3d7261b68c3ef7d42645ee5bfe17 (diff) |
Revert of Move sRGB <-> linear conversion components to their own files. (patchset #5 id:80001 of https://codereview.chromium.org/2128893002/ )
Reason for revert:
Monotonicity assert is failing on ARM. (Different rsqrt() and invert() precision?) Will investigate a bit tomorrow... might reland with the test TODO.
Original issue's description:
> Move sRGB <-> linear conversion components to their own files.
>
> This makes them a little easier to use outside SkColorXform code.
>
> I've added some notes about how best to use them and their eccentricities, and added a test.
>
> Ultimately any software sRGB <-> linear conversion should funnel somehow through here.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2128893002
> CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/45e58c8807179638980aae8503573b950b844e4c
TBR=reed@google.com,msarett@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2131793002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/SRGBTest.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/tests/SRGBTest.cpp b/tests/SRGBTest.cpp deleted file mode 100644 index 89930b5c05..0000000000 --- a/tests/SRGBTest.cpp +++ /dev/null @@ -1,34 +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 "SkSRGB.h" -#include "Test.h" -#include <math.h> - -static uint8_t linear_to_srgb(float l) { - return (uint8_t)roundf(sk_linear_to_srgb(Sk4f{l})[0]); -} - -DEF_TEST(sk_linear_to_srgb, r) { - // Should map 0 -> 0 and 1 -> 1. - REPORTER_ASSERT(r, 0 == linear_to_srgb(0.0f)); - REPORTER_ASSERT(r, 255 == linear_to_srgb(1.0f)); - - // Should be monotonic between 0 and 1. - // We don't bother checking denorm values. - uint8_t prev = 0; - for (float f = FLT_MIN; f <= 1.0f; ) { - uint8_t srgb = linear_to_srgb(f); - - REPORTER_ASSERT(r, srgb >= prev); - prev = srgb; - - union { float flt; uint32_t bits; } pun = { f }; - pun.bits++; - f = pun.flt; - } -} |