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

Reland "match sRGB primaries with skcms"

Browse Source 
This reverts commit 3dfc752622.

Reason for revert: Re-landing now that chrome is guarded.

Original change's description:
> Revert "match sRGB primaries with skcms"
> 
> This reverts commit 66567d870f.
> 
> Reason for revert: will reland after guarding Chromium.
> 
> Original change's description:
> > match sRGB primaries with skcms
> > 
> > This should prevent lots of conversions between the two
> > gamuts when the matrix is nearly but not quite identity.
> > 
> > Change-Id: Icb6ba35d763e9fbd2d7fc6343d49fe2c542ec2ec
> > Reviewed-on: https://skia-review.googlesource.com/148990
> > Commit-Queue: Mike Klein <mtklein@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
> > Auto-Submit: Mike Klein <mtklein@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
> 
> TBR=mtklein@google.com,brianosman@google.com
> 
> Change-Id: If511843bdfc7cdef2a3b68eb992e684123e806de
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/149080
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,brianosman@google.com

Change-Id: I0117bf28b12c784fa05088e3ea611f415f2d4711
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/149260
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-08-24 17:36:50 +00:00 committed by Skia Commit-Bot
parent 5005a224aa
commit 12d966fc4f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/SkColorSpacePriv.h
View File

@ -15,9 +15,17 @@
#define SkColorSpacePrintf(...)
static constexpr float gSRGB_toXYZD50[] {
#ifdef SK_LEGACY_SRGB_GAMUT
0.4360747f, 0.3850649f, 0.1430804f, // Rx, Gx, Bx
0.2225045f, 0.7168786f, 0.0606169f, // Ry, Gy, By
0.0139322f, 0.0971045f, 0.7141733f, // Rz, Gz, Bz
#else
// These are taken from skcms, and there originally from 16-bit fixed point.
// For best results, please keep them exactly in sync with skcms.
0.436065674f, 0.385147095f, 0.143066406f,
0.222488403f, 0.716873169f, 0.060607910f,
0.013916016f, 0.097076416f, 0.714096069f,
#endif
};
static constexpr float gAdobeRGB_toXYZD50[] {