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

revert a801d76, fixes #5716

Browse Source
This commit is contained in:
Ingo Weyrich 2020-04-20 13:43:08 +02:00
parent 22eee9787e
commit d165a08e36
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/dcraw.cc
View File

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