From 1fdc2d7b49327c9e08ca037d04a51a7c22e159cd Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Mon, 9 Oct 2017 09:46:00 +0200
Subject: [PATCH] dcraw: do not use CameraCalibration matrices when loading DNG
 files

This is to make sure that DNG-converted and original raw files are processed in the same way

Fixes #4129
---
 rtengine/dcraw.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index f8918896b..f59f5b2fe 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -6244,6 +6244,16 @@ guess_cfa_pc:
     free (buf);
   }
 
+  /* RT -- do not use CameraCalibration matrices for DNGs - see #4129 */
+  for (j=0; j < 4; j++) {
+      ab[j] = 1;
+      for (i=0; i < 4; i++) {
+          cc[0][j][i] = i == j;
+          cc[1][j][i] = i == j;
+      }
+  }
+  /* RT end */
+
   for (i=0; i < colors; i++)
     FORCC cc[cm_D65][i][c] *= ab[i];
   if (use_cm) {