From 8cad2f8863de38c7d7d89249cbd1b180ff520c18 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Fri, 21 Oct 2016 00:41:27 +0200
Subject: [PATCH] CbDL badly interacts with Graduated and Vignetting Filter if
 CbDL is set to 'before Black-and-White', fixes #3473

---
 rtengine/dcrop.cc             |  6 +++---
 rtengine/improccoordinator.cc | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 1b1d460f3..9f5b071ea 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -678,7 +678,7 @@ void Crop::update (int todo)
     createBuffer(cropw, croph);
 
     // transform
-    if (needstransform) {
+    if (needstransform || ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
         if (!transCrop) {
             transCrop = new Imagefloat (cropw, croph);
         }
@@ -687,6 +687,8 @@ void Crop::update (int todo)
             parent->ipf.transform (baseCrop, transCrop, cropx / skip, cropy / skip, trafx / skip, trafy / skip, SKIPS(parent->fw, skip), SKIPS(parent->fh, skip), parent->getFullWidth(), parent->getFullHeight(),
                                    parent->imgsrc->getMetaData()->getFocalLen(), parent->imgsrc->getMetaData()->getFocalLen35mm(),
                                    parent->imgsrc->getMetaData()->getFocusDist(), parent->imgsrc->getRotateDegree(), false);
+        else
+            baseCrop->copyData(transCrop);
 
         if (transCrop) {
             baseCrop = transCrop;
@@ -1107,8 +1109,6 @@ bool Crop::setCropSizes (int rcx, int rcy, int rcw, int rch, int skip, bool inte
     ProcParams& params = parent->params;
     parent->ipf.transCoord (parent->fw, parent->fh, bx1, by1, bw, bh, orx, ory, orw, orh);
 
-    int tr = getCoarseBitMask(params.coarse);
-
     PreviewProps cp (orx, ory, orw, orh, skip);
     int orW, orH;
     parent->imgsrc->getSize (cp, orW, orH);
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index b3f5afee8..5a17ef1f5 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -372,19 +372,21 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
     // Remove transformation if unneeded
     bool needstransform = ipf.needsTransform();
 
-    if (!needstransform && orig_prev != oprevi) {
+    if (!needstransform && !((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
         delete oprevi;
         oprevi = orig_prev;
     }
 
-    if (needstransform && orig_prev == oprevi) {
-        oprevi = new Imagefloat (pW, pH);
+    if ((needstransform || ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
+        if(!oprevi || oprevi == orig_prev)
+            oprevi = new Imagefloat (pW, pH);
+        if ((todo & M_TRANSFORM) && needstransform)
+            ipf.transform (orig_prev, oprevi, 0, 0, 0, 0, pW, pH, fw, fh, imgsrc->getMetaData()->getFocalLen(),
+                           imgsrc->getMetaData()->getFocalLen35mm(), imgsrc->getMetaData()->getFocusDist(), imgsrc->getRotateDegree(), false);
+        else
+            orig_prev->copyData(oprevi);
     }
 
-    if ((todo & M_TRANSFORM) && needstransform)
-        ipf.transform (orig_prev, oprevi, 0, 0, 0, 0, pW, pH, fw, fh, imgsrc->getMetaData()->getFocalLen(),
-                       imgsrc->getMetaData()->getFocalLen35mm(), imgsrc->getMetaData()->getFocusDist(), imgsrc->getRotateDegree(), false);
-
     if ((todo & (M_TRANSFORM))  && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
         const int W = oprevi->getWidth();
         const int H = oprevi->getHeight();