commit df44fc5f2bb282557df291e20dbd26c070533aa6
author Matt Sarett <msarett@google.com> Tue Oct 11 16:57:50 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 11 21:59:09 2016 +0000
tree 294b40001d8928e59771848e12efb70956922b58
parent 3eb71216d2fb70114417ae8ee9b0c5f5dc650704

Add SkColorSpaceTransferFn to SkColorSpace

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3178

Change-Id: I354342d4469cee0e25a7b0d189e925e431da623c
Reviewed-on: https://skia-review.googlesource.com/3178
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

tests/ColorSpaceXformTest.cpp

diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index f792c6a..0885d58 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -86,12 +86,13 @@
 
 DEF_TEST(ColorSpaceXform_ParametricGamma, r) {
     // Parametric gamma curves
-    void* memory = sk_malloc_throw(sizeof(SkGammas) + sizeof(SkGammas::Params));
+    void* memory = sk_malloc_throw(sizeof(SkGammas) + sizeof(SkColorSpaceTransferFn));
     sk_sp<SkGammas> gammas = sk_sp<SkGammas>(new (memory) SkGammas());
     gammas->fRedType = gammas->fGreenType = gammas->fBlueType = SkGammas::Type::kParam_Type;
     gammas->fRedData.fParamOffset = gammas->fGreenData.fParamOffset =
             gammas->fBlueData.fParamOffset = 0;
-    SkGammas::Params* params = SkTAddOffset<SkGammas::Params>(memory, sizeof(SkGammas));
+    SkColorSpaceTransferFn* params = SkTAddOffset<SkColorSpaceTransferFn>
+            (memory, sizeof(SkGammas));
 
     // Interval, switch xforms at 0.0031308f
     params->fD = 0.04045f;
@@ -129,7 +130,7 @@
 DEF_TEST(ColorSpaceXform_NonMatchingGamma, r) {
     constexpr size_t tableSize = 10;
     void* memory = sk_malloc_throw(sizeof(SkGammas) + sizeof(float) * tableSize +
-                                   sizeof(SkGammas::Params));
+                                   sizeof(SkColorSpaceTransferFn));
     sk_sp<SkGammas> gammas = sk_sp<SkGammas>(new (memory) SkGammas());
 
     float* table = SkTAddOffset<float>(memory, sizeof(SkGammas));
@@ -144,8 +145,8 @@
     table[8] = 0.85f;
     table[9] = 1.00f;
 
-    SkGammas::Params* params = SkTAddOffset<SkGammas::Params>(memory, sizeof(SkGammas) +
-                                                              sizeof(float) * tableSize);
+    SkColorSpaceTransferFn* params = SkTAddOffset<SkColorSpaceTransferFn>(memory,
+            sizeof(SkGammas) + sizeof(float) * tableSize);
     params->fA = 1.0f / 1.055f;
     params->fB = 0.055f / 1.055f;
     params->fC = 0.0f;