liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change ACES matrix with Bradford D50 D60

Browse Source
This commit is contained in:
Desmis
2018-04-10 09:24:25 +02:00
parent 6bc6e7b3a7
commit b5f4cbd728
10 changed files with 2719 additions and 2592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rtengine/iccmatrices.h
View File

@@ -32,6 +32,19 @@ constexpr double d50_d65[3][3] = {
{ -0.0092345, 0.0150436, 0.7521316}
};
//J.Desmis 04 2018
constexpr double d50_d60[3][3] = {
{ 1.034368, 0.016908, -0.037658},
{0.021752, 0.992183, -0.012785},
{ -0.006971, 0.011377, 0.812150}
};
constexpr double d60_d50[3][3] = {
{ 0.96743198, -0.01699717, 0.044590689},
{-0.02109893, 1.008067172, 0.014890785},
{0.008598998, -0.01426777, 1.231474467}
};
// Color space conversion to/from XYZ; color spaces adapted to D65
constexpr double xyz_sRGBd65[3][3] = {
{0.4124564, 0.3575761, 0.1804375},
@@ -65,7 +78,7 @@ constexpr double xyz_sRGB[3][3] = {
{0.2225045, 0.7168786, 0.0606169},
{0.0139322, 0.0971045, 0.7141733}
};
/*
//from Elle Stone
constexpr double xyz_ACESc[3][3] = {
{0.68988, 0.14977, 0.12456},
@@ -75,12 +88,12 @@ constexpr double xyz_ACESc[3][3] = {
constexpr double ACESc_xyz[3][3] = {
{1.592666, -0.351803, -0.222887},
{-0.675936, 1.639273 , 0.015117},
{-0.675936, 1.639273, 0.015117},
{0.0199598, -0.022576, 1.2162916}
};
/*
//from LCMS calculation same as ACES.icm
//Matrix ACESc from LCMS calculation same as ACES.icm
constexpr double xyz_ACESc[3][3] = {
{0.99089, 0.01224, -0.03893},
{0.36189, 0.72252, -0.08441},
@@ -92,19 +105,22 @@ constexpr double xyz_ACESc[3][3] = {
{0.237431, 0.52681, -0.05590},
{0.127169, 0.043493, 0.793903}
};
//with Bradford adaptation D60 D50
*/
//with Bradford adaptation D50 D60 J.Desmis 04 2018
// ACESc_xyz = matrix ACESc * matrix d60 D50
constexpr double ACESc_xyz[3][3] = {
{1.015799, -0.017739, -0.046435},
{-0.507793, 1.391284 , 0.119201},
{0.008491, -0.014084, 1.219402}
{0.956674714, 0.334059262, 0.033764461},
{-0.00914767, 0.719456271 , 0.020585086},
{-0.03959528, -0.11114562, 1.008891993}
};
constexpr double ACESc_xyz[3][3] = {
{0.897022, -0.79074, 0.088539},
{-0.103127, 2.76928 , 0.00767},
{-0.19296, 0.01424, 1.256792}
constexpr double xyz_ACESc[3][3] = {
{1.039605861, -0.48655298, -0.0248649},
{0.012013027, 1.379948826 , -0.02855804},
{0.04212411, 0.132928069, 0.987064397}
};
*/
//end modification ACES matrix
constexpr double sRGB_xyz[3][3] = {
{3.1338561, -1.6168667, -0.4906146},
{ -0.9787684, 1.9161415, 0.0334540},