diff options
| author |  msarett <msarett@google.com> | 2016-06-06 07:26:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-06 07:26:39 -0700 |
| commit | 64d31430e01a37b735f5b1de55798bddb564cdeb (patch) | |
| tree | 577b86398c7097ece8eda650108d7c2ee93fc25c | |
| parent | 55fdcccf01d49173bc731024b4283d3a3ea9150a (diff) | |
Name parametric gamma curve types
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041753004
Review-Url: https://codereview.chromium.org/2041753004
| -rw-r--r-- | src/core/SkColorSpace.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp index bf99b474a2..3a81d276a8 100644 --- a/src/core/SkColorSpace.cpp +++ b/src/core/SkColorSpace.cpp @@ -484,9 +484,17 @@ bool load_gammas(SkGammaCurve* gammas, uint32_t numGammas, const uint8_t* src, s break; } case kTAG_ParaCurveType: { + enum ParaCurveType { + kExponential_ParaCurveType = 0, + kGAB_ParaCurveType = 1, + kGABC_ParaCurveType = 2, + kGABDE_ParaCurveType = 3, + kGABCDEF_ParaCurveType = 4, + }; + // Determine the format of the parametric curve tag. uint16_t format = read_big_endian_short(src + 8); - if (0 == format) { + if (kExponential_ParaCurveType == format) { tagBytes = 12 + 4; if (len < tagBytes) { SkColorSpacePrintf("gamma tag is too small (%d bytes)", len); @@ -506,7 +514,7 @@ bool load_gammas(SkGammaCurve* gammas, uint32_t numGammas, const uint8_t* src, s // We will fill in with zeros as necessary to always match the above form. float g = 0.0f, a = 0.0f, b = 0.0f, c = 0.0f, d = 0.0f, e = 0.0f, f = 0.0f; switch(format) { - case 1: { + case kGAB_ParaCurveType: { tagBytes = 12 + 12; if (len < tagBytes) { SkColorSpacePrintf("gamma tag is too small (%d bytes)", len); @@ -521,7 +529,7 @@ bool load_gammas(SkGammaCurve* gammas, uint32_t numGammas, const uint8_t* src, s d = -b / a; break; } - case 2: + case kGABC_ParaCurveType: tagBytes = 12 + 16; if (len < tagBytes) { SkColorSpacePrintf("gamma tag is too small (%d bytes)", len); @@ -537,7 +545,7 @@ bool load_gammas(SkGammaCurve* gammas, uint32_t numGammas, const uint8_t* src, s d = -b / a; f = c; break; - case 3: + case kGABDE_ParaCurveType: tagBytes = 12 + 20; if (len < tagBytes) { SkColorSpacePrintf("gamma tag is too small (%d bytes)", len); @@ -552,7 +560,7 @@ bool load_gammas(SkGammaCurve* gammas, uint32_t numGammas, const uint8_t* src, s d = SkFixedToFloat(read_big_endian_int(src + 28)); e = SkFixedToFloat(read_big_endian_int(src + 24)); break; - case 4: + case kGABCDEF_ParaCurveType: tagBytes = 12 + 28; if (len < tagBytes) { SkColorSpacePrintf("gamma tag is too small (%d bytes)", len); |