Some fixes as hinted by Coverity (#3558)

2017-06-05 10:58:14 +02:00
parent 982b291a64
commit 051670160b
9 changed files with 54 additions and 63 deletions
--- a/rtengine/ipretinex.cc
+++ b/rtengine/ipretinex.cc
@@ -273,8 +273,9 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
                }
            }

-            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 **e
                    limdx = limD * (0.4f * it + 0.6f);
                    ilimdx = 1.f / limdx;
                }
-            } else {
-                varx = vart;
-                limdx = limD;
-                ilimdx = ilimD;
            }

            scal = round(sc);