diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index 661f399ef..c1a4a5979 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -84,8 +84,8 @@ class ImProcFunctions
     void calcVignettingParams(int oW, int oH, const procparams::VignettingParams& vignetting, double &w2, double &h2, double& maxRadius, double &v, double &b, double &mul);
 
     void transformLuminanceOnly(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int oW, int oH, int fW, int fH);
-    void transformGeneral(bool highQuality, Imagefloat *original, Imagefloat *transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const LensCorrection *pLCPMap);
-    void transformLCPCAOnly(Imagefloat *original, Imagefloat *transformed, int cx, int cy, const LensCorrection *pLCPMap);
+    void transformGeneral(bool highQuality, Imagefloat *original, Imagefloat *transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const LensCorrection *pLCPMap, bool useOriginalBuffer);
+    void transformLCPCAOnly(Imagefloat *original, Imagefloat *transformed, int cx, int cy, const LensCorrection *pLCPMap, bool useOriginalBuffer);
 
     bool needsCA() const;
     bool needsDistortion() const;
@@ -156,7 +156,7 @@ public:
 //    void colorCurve       (LabImage* lold, LabImage* lnew);
     void sharpening(LabImage* lab, const procparams::SharpeningParams &sharpenParam, bool showMask = false);
     void sharpeningcam(CieImage* ncie, float** buffer, bool showMask = false);
-    void transform(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const FramesMetaData *metadata, int rawRotationDeg, bool fullImage);
+    void transform(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const FramesMetaData *metadata, int rawRotationDeg, bool fullImage, bool useOriginalBuffer = false);
     float resizeScale(const procparams::ProcParams* params, int fw, int fh, int &imw, int &imh);
     void lab2monitorRgb(LabImage* lab, Image8* image);
     void resize(Imagefloat* src, Imagefloat* dst, float dScale);
diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index caa5b7e4e..fc79dcae4 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -86,25 +86,25 @@ float normn (float a, float b, int n)
     }
 }
 
-void logEncode(rtengine::Imagefloat *original, bool multiThread) {
+void logEncode(rtengine::Imagefloat *src, rtengine::Imagefloat *dest, bool multiThread) {
 
 #ifdef _OPENMP
     #pragma omp parallel for schedule(dynamic, 16) if(multiThread)
 #endif
 
-    for (int y = 0; y < original->getHeight(); ++y) {
+    for (int y = 0; y < src->getHeight(); ++y) {
         int x = 0;
 #ifdef __SSE2__
-        for (; x < original->getWidth() - 3; x += 4) {
-            STVFU(original->r(y, x), xlogf1(LVFU(original->r(y, x))));
-            STVFU(original->g(y, x), xlogf1(LVFU(original->g(y, x))));
-            STVFU(original->b(y, x), xlogf1(LVFU(original->b(y, x))));
+        for (; x < src->getWidth() - 3; x += 4) {
+            STVFU(dest->r(y, x), xlogf1(LVFU(src->r(y, x))));
+            STVFU(dest->g(y, x), xlogf1(LVFU(src->g(y, x))));
+            STVFU(dest->b(y, x), xlogf1(LVFU(src->b(y, x))));
         }
 #endif
-        for (; x < original->getWidth(); ++x) {
-            original->r(y, x) = xlogf1(original->r(y, x));
-            original->g(y, x) = xlogf1(original->g(y, x));
-            original->b(y, x) = xlogf1(original->b(y, x));
+        for (; x < src->getWidth(); ++x) {
+            dest->r(y, x) = xlogf1(src->r(y, x));
+            dest->g(y, x) = xlogf1(src->g(y, x));
+            dest->b(y, x) = xlogf1(src->b(y, x));
         }
     }
 }
@@ -536,7 +536,7 @@ bool ImProcFunctions::transCoord (int W, int H, int x, int y, int w, int h, int&
 
 void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH,
                                  const FramesMetaData *metadata,
-                                 int rawRotationDeg, bool fullImage)
+                                 int rawRotationDeg, bool fullImage, bool useOriginalBuffer)
 {
     double focalLen = metadata->getFocalLen();
     double focalLen35mm = metadata->getFocalLen35mm();
@@ -584,10 +584,10 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
                 dest = tmpimg.get();
             }
         }
-        transformGeneral(highQuality, original, dest, cx, cy, sx, sy, oW, oH, fW, fH, pLCPMap.get());
+        transformGeneral(highQuality, original, dest, cx, cy, sx, sy, oW, oH, fW, fH, pLCPMap.get(), useOriginalBuffer);
         
         if (highQuality && dest != transformed) {
-            transformLCPCAOnly(dest, transformed, cx, cy, pLCPMap.get());
+            transformLCPCAOnly(dest, transformed, cx, cy, pLCPMap.get(), useOriginalBuffer);
         }
     }
 }
@@ -976,7 +976,7 @@ void ImProcFunctions::transformLuminanceOnly (Imagefloat* original, Imagefloat*
 }
 
 
-void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, Imagefloat *transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const LensCorrection *pLCPMap)
+void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, Imagefloat *transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const LensCorrection *pLCPMap, bool useOriginalBuffer)
 {
 
     // set up stuff, depending on the mode we are
@@ -1058,8 +1058,15 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
     const double centerFactorx = cx - w2;
     const double centerFactory = cy - h2;
 
+    std::unique_ptr<Imagefloat> tempLog;
     if (useLog) {
-        logEncode(original, multiThread);
+        if (!useOriginalBuffer) {
+            tempLog.reset(new Imagefloat(original->getWidth(), original->getHeight()));
+            logEncode(original, tempLog.get(), multiThread);
+            original = tempLog.get();
+        } else {
+            logEncode(original, original, multiThread);
+        }
     }
     // main cycle
 #ifdef _OPENMP
@@ -1205,7 +1212,7 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
 }
 
 
-void ImProcFunctions::transformLCPCAOnly(Imagefloat *original, Imagefloat *transformed, int cx, int cy, const LensCorrection *pLCPMap)
+void ImProcFunctions::transformLCPCAOnly(Imagefloat *original, Imagefloat *transformed, int cx, int cy, const LensCorrection *pLCPMap, bool useOriginalBuffer)
 {
     assert(pLCPMap && params->lensProf.useCA && pLCPMap->isCACorrectionAvailable());
     const bool useLog = params->pdsharpening.enabled;
@@ -1220,8 +1227,15 @@ void ImProcFunctions::transformLCPCAOnly(Imagefloat *original, Imagefloat *trans
     chTrans[1] = transformed->g.ptrs;
     chTrans[2] = transformed->b.ptrs;
 
+    std::unique_ptr<Imagefloat> tempLog;
     if (useLog) {
-        logEncode(original, multiThread);
+        if (!useOriginalBuffer) {
+            tempLog.reset(new Imagefloat(original->getWidth(), original->getHeight()));
+            logEncode(original, tempLog.get(), multiThread);
+            original = tempLog.get();
+        } else {
+            logEncode(original, original, multiThread);
+        }
     }
 
 #ifdef _OPENMP
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index c35fc7431..3811c0c80 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -880,7 +880,7 @@ private:
                 trImg = new Imagefloat (fw, fh);
             }
             ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
-                           imgsrc->getMetaData(), imgsrc->getRotateDegree(), true);
+                           imgsrc->getMetaData(), imgsrc->getRotateDegree(), true, true);
             if(trImg != baseImg) {
                 delete baseImg;
                 baseImg = trImg;