Merge branch 'dev' into ph1speedup

rtengine/iptransform.cc

@@ -796,9 +796,6 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
 
         case ImProcFunctions::TRANSFORM_HIGH_QUALITY: {
             enableLCPDist = pLCPMap && params->lensProf.useDist;
-            if (enableLCPCA) {
-                enableLCPDist = false;
-            }
             enableCA = enableLCPCA || needsCA();
         }
         //no break on purpose
@@ -810,6 +807,10 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
         }
     }
 
+    if (enableLCPCA) {
+        enableLCPDist = false;
+    }    
+
     if (!enableCA) {
         chDist[0] = 0.0;
     }

rtengine/simpleprocess.cc

@@ -817,7 +817,8 @@ private:
                 trImg = baseImg;
             } else {
                 trImg = new Imagefloat (fw, fh);
-            }           ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
+            }
+            ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
                            imgsrc->getMetaData(), imgsrc->getRotateDegree(), true);
             if(trImg != baseImg) {
                 delete baseImg;