diff options
| author |  Matt Sarett <msarett@google.com> | 2016-10-13 18:24:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-14 13:57:37 +0000 |
| commit | c434f5122a2394639ddeb66a1ded456565b043cd (patch) | |
| tree | 556393422cfa433b9562d126385157e1ae34cc19 /tests | |
| parent | 285db44562da7136686e6d34a8443c6c6e0b942c (diff) | |
Add NewRGB() with float gamma to SkColorSpace public API
Necessary because PNGs like to specify their gamma this way.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3402
Change-Id: I399984d611db907b115b345df1afc88d39326fbb
Reviewed-on: https://skia-review.googlesource.com/3402
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ColorSpaceTest.cpp | 8 | ||||
| -rw-r--r-- | tests/SurfaceTest.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index e9cc14ff45..aa0a33b407 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -228,7 +228,7 @@ DEF_TEST(ColorSpace_Serialize, r) { const float gammas[] = { 1.1f, 1.2f, 1.7f, }; SkMatrix44 toXYZ(SkMatrix44::kIdentity_Constructor); - test_serialize(r, SkColorSpace_Base::NewRGB(gammas, toXYZ).get(), false); + test_serialize(r, SkColorSpace::NewRGB(gammas, toXYZ).get(), false); SkColorSpaceTransferFn fn; fn.fA = 1.0f; @@ -256,9 +256,9 @@ DEF_TEST(ColorSpace_Equals, r) { const float gammas1[] = { 1.1f, 1.2f, 1.3f, }; const float gammas2[] = { 1.1f, 1.2f, 1.7f, }; SkMatrix44 toXYZ(SkMatrix44::kIdentity_Constructor); - sk_sp<SkColorSpace> rgb1 = SkColorSpace_Base::NewRGB(gammas1, toXYZ); - sk_sp<SkColorSpace> rgb2 = SkColorSpace_Base::NewRGB(gammas2, toXYZ); - sk_sp<SkColorSpace> rgb3 = SkColorSpace_Base::NewRGB(gammas1, toXYZ); + sk_sp<SkColorSpace> rgb1 = SkColorSpace::NewRGB(gammas1, toXYZ); + sk_sp<SkColorSpace> rgb2 = SkColorSpace::NewRGB(gammas2, toXYZ); + sk_sp<SkColorSpace> rgb3 = SkColorSpace::NewRGB(gammas1, toXYZ); SkColorSpaceTransferFn fn; fn.fA = 1.0f; diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 224e8c74cf..241ddb1dbc 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -923,7 +923,7 @@ static void test_surface_creation_and_snapshot_with_color_space( auto adobeColorSpace = SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named); SkMatrix44 srgbMatrix = as_CSB(srgbColorSpace)->toXYZD50(); const float oddGamma[] = { 2.4f, 2.4f, 2.4f }; - auto oddColorSpace = SkColorSpace_Base::NewRGB(oddGamma, srgbMatrix); + auto oddColorSpace = SkColorSpace::NewRGB(oddGamma, srgbMatrix); auto linearColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named); const struct { |