AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Recognize more sRGB gammas

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1975883003

Review-Url: https://codereview.chromium.org/1975883003
This commit is contained in:
msarett 2016-05-13 06:19:04 -07:00 committed by Commit bot
parent 9837740dd5
commit c2e4bb39d4
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/SkColorSpace.cpp
View File

@ -336,15 +336,20 @@ bool SkColorSpace::LoadGammas(SkGammaCurve* gammas, uint32_t numGammas, const ui
// calculation necessary. We encounter identical gamma curves over and
// over again, but relatively few variations.
if (1024 == count) {
// The magic values were chosen because they match a very common sRGB
// gamma table and the less common Canon sRGB gamma table (which use
// different rounding rules).
if (0 == read_big_endian_short((const uint8_t*) &table[0]) &&
3341 == read_big_endian_short((const uint8_t*) &table[256]) &&
14057 == read_big_endian_short((const uint8_t*) &table[512]) &&
3366 == read_big_endian_short((const uint8_t*) &table[257]) &&
14116 == read_big_endian_short((const uint8_t*) &table[513]) &&
34318 == read_big_endian_short((const uint8_t*) &table[768]) &&
65535 == read_big_endian_short((const uint8_t*) &table[1023])) {
gammas[i].fValue = 2.2f;
break;
}
} else if (26 == count) {
// The magic values were chosen because they match a very common sRGB
// gamma table.
if (0 == read_big_endian_short((const uint8_t*) &table[0]) &&
3062 == read_big_endian_short((const uint8_t*) &table[6]) &&
12824 == read_big_endian_short((const uint8_t*) &table[12]) &&
@ -353,6 +358,17 @@ bool SkColorSpace::LoadGammas(SkGammaCurve* gammas, uint32_t numGammas, const ui
gammas[i].fValue = 2.2f;
break;
}
} else if (4096 == count) {
// The magic values were chosen because they match Nikon, Epson, and
// LCMS sRGB gamma tables (all of which use different rounding rules).
if (0 == read_big_endian_short((const uint8_t*) &table[0]) &&
950 == read_big_endian_short((const uint8_t*) &table[515]) &&
3342 == read_big_endian_short((const uint8_t*) &table[1025]) &&
14079 == read_big_endian_short((const uint8_t*) &table[2051]) &&
65535 == read_big_endian_short((const uint8_t*) &table[4095])) {
gammas[i].fValue = 2.2f;
break;
}
}
// Otherwise, fill in the interpolation table.