From d54a6bcc8cf89f32ec4999272a830ab6bb1a2f32 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 8 Jan 2017 20:44:38 +0100 Subject: [PATCH] Revert "Crash on reading floating point demosaiced DNG files, fixes #3600" This reverts commit 32f3aaab733e771d81beccf8f2ce9d2c63f12f45. --- 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 063c4722d..dcfe66ee5 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -8753,7 +8753,7 @@ void CLASS identify() case 0: case 1: load_raw = &CLASS packed_dng_load_raw; break; case 7: load_raw = &CLASS lossless_dng_load_raw; break; - case 8: if(tiff_samples == 1) load_raw = &CLASS deflate_dng_load_raw; break; + case 8: load_raw = &CLASS deflate_dng_load_raw; break; case 34892: load_raw = &CLASS lossy_dng_load_raw; break; default: load_raw = 0; } diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 2b8404b1b..22c53d831 100644 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ ---- dcraw.c 2017-01-06 20:50:39 +0000 -+++ dcraw.cc 2017-01-08 15:38:38 +0000 +--- dcraw.c 2016-10-28 13:45:27 +0000 ++++ dcraw.cc 2016-10-31 13:35:15 +0000 @@ -1,3 +1,16 @@ +/*RT*/#include +/*RT*/#include @@ -2935,7 +2935,7 @@ case 0: case 1: load_raw = &CLASS packed_dng_load_raw; break; case 7: load_raw = &CLASS lossless_dng_load_raw; break; -+ case 8: if(tiff_samples == 1) load_raw = &CLASS deflate_dng_load_raw; break; ++ case 8: load_raw = &CLASS deflate_dng_load_raw; break; case 34892: load_raw = &CLASS lossy_dng_load_raw; break; default: load_raw = 0; }