merge with Dev

2017-09-18 16:28:28 +02:00
parent 99353cae14 33867a4bf2
commit 1b78046318
23 changed files with 235 additions and 125 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -1752,9 +1752,7 @@ bool check_need_larger_crop_for_lcp_distortion (int fw, int fh, int x, int y, in
        return false;
    }

-    return (params.lensProf.useDist &&
-            (params.lensProf.useLensfun ||
-             params.lensProf.lcpFile.length() > 0));
+    return (params.lensProf.useDist && (params.lensProf.useLensfun() || params.lensProf.useLcp()));
 }

 } // namespace