From a801d768ea6590a3eeb74cf035280f89db9278f7 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Tue, 10 Mar 2020 22:13:48 +0100 Subject: [PATCH] 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 --- rtengine/dcraw.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index ac47c67a6..8085e12b6 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -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);