merge with dev

2017-06-11 18:38:31 +02:00
parent 849a2652a3 e8bbefef7a
commit f1a90dad54
33 changed files with 215 additions and 138 deletions
--- a/rtengine/ipretinex.cc
+++ b/rtengine/ipretinex.cc
@@ -273,8 +273,9 @@ void RawImageSource::MSR (float** luminance, float** originalLuminance, float **
                }
            }

-            float varx = 0.f;
-            float limdx, ilimdx;
+            float varx = vart;
+            float limdx = limD;
+            float ilimdx = ilimD;

            if (gradvart != 0) {
                if (gradvart == 1) {
@@ -294,10 +295,6 @@ void RawImageSource::MSR (float** luminance, float** originalLuminance, float **
                    limdx = limD * (0.4f * it + 0.6f);
                    ilimdx = 1.f / limdx;
                }
-            } else {
-                varx = vart;
-                limdx = limD;
-                ilimdx = ilimD;
            }

            scal = round (sc);