From 9effb0a5ecf0f32dc316e63c07875d5a4f327f22 Mon Sep 17 00:00:00 2001 From: Ingo Date: Thu, 21 May 2015 13:25:21 +0200 Subject: [PATCH] Correction for Issue 2776, 'Dcraw.cc does not respect the Illuminant tags in DNG files' --- rtengine/dcraw.cc | 2 +- rtengine/dcraw.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index eebd516c6..7db087372 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -5587,7 +5587,7 @@ void CLASS parse_kodak_ifd (int base) int CLASS parse_tiff_ifd (int base) { unsigned entries, tag, type, len, plen=16, save; - int ifd, use_cm=0, cfa, i, j, c, ima_len=0,cm_D65=1; + int ifd, use_cm=0, cfa, i, j, c, ima_len=0,cm_D65=0; char software[64], *cbuf, *cp; uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256]; double cc[2][4][4], cm[2][4][3], cam_xyz[4][3], num; diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 6dbd193fc..40d03a80c 100755 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ ---- dcraw.c 2015-05-14 22:11:59 +0000 -+++ dcraw.cc 2015-05-15 11:53:23 +0000 +--- dcraw.c 2015-05-17 18:31:07 +0000 ++++ dcraw.cc 2015-05-21 11:05:29 +0000 @@ -1,3 +1,15 @@ +/*RT*/#include +/*RT*/#include @@ -1066,7 +1066,7 @@ { unsigned entries, tag, type, len, plen=16, save; - int ifd, use_cm=0, cfa, i, j, c, ima_len=0; -+ int ifd, use_cm=0, cfa, i, j, c, ima_len=0,cm_D65=1; ++ int ifd, use_cm=0, cfa, i, j, c, ima_len=0,cm_D65=0; char software[64], *cbuf, *cp; uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256]; - double cc[4][4], cm[4][3], cam_xyz[4][3], num;