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

fixed lookup of camera matrices for DNG files always prefer our matrices in camconst.json over the embedded ones if available, patch taken from ART

Browse Source
This commit is contained in:
Ingo Weyrich
2020-03-10 22:13:48 +01:00
parent cd0fb4f1b6
commit a801d768ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/dcraw.cc
View File

@@ -9077,9 +9077,6 @@ void CLASS adobe_coeff (const char *make, const char *model)
if (RT_blacklevel_from_constant == ThreeValBool::X || is_pentax_dng) {
RT_blacklevel_from_constant = ThreeValBool::T;
}
if (RT_matrix_from_constant == ThreeValBool::X) {
RT_matrix_from_constant = ThreeValBool::T;
}
// -- RT --------------------------------------------------------------------
for (i=0; i < sizeof table / sizeof *table; i++)
@@ -9097,6 +9094,9 @@ void CLASS adobe_coeff (const char *make, const char *model)
black <<= 2;
tiff_bps += 2;
}
if (RT_matrix_from_constant == ThreeValBool::X) {
RT_matrix_from_constant = ThreeValBool::T;
}
{ /* Check for RawTherapee table overrides and extensions */
int black_level, white_level;
short trans[12];
@@ -10541,7 +10541,7 @@ dng_skip:
* files. See #4129 */) {
memcpy (rgb_cam, cmatrix, sizeof cmatrix);
// raw_color = 0;
RT_matrix_from_constant = ThreeValBool::F;
RT_matrix_from_constant = ThreeValBool::X;
}
if(!strncmp(make, "Panasonic", 9) && !strncmp(model, "DMC-LX100",9))
adobe_coeff (make, model);