merge with dev - I hope no error

2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
--- a/rtengine/labimage.cc
+++ b/rtengine/labimage.cc
@@ -101,7 +101,7 @@ void LabImage::deleteLab()
 void LabImage::reallocLab()
 {
    allocLab(W, H);
-};
+}

 void LabImage::clear(bool multiThread) {
 #ifdef _OPENMP