Cppcheck: Fix some warnings

2016-10-12 19:04:06 +02:00
parent 29d5329f3f
commit e98bd47487
16 changed files with 66 additions and 525 deletions
--- a/rtengine/ffmanager.cc
+++ b/rtengine/ffmanager.cc
@@ -31,17 +31,19 @@ extern const Settings* settings;

 inline ffInfo& ffInfo::operator =(const ffInfo &o)
 {
-    pathname = o.pathname;
-    maker = o.maker;
-    model = o.model;
-    lens = o.lens;
-    shutter = o.shutter;
-    focallength = o.focallength;
-    timestamp = o.timestamp;
+    if (this != &o) {
+        pathname = o.pathname;
+        maker = o.maker;
+        model = o.model;
+        lens = o.lens;
+        focallength = o.focallength;
+        timestamp = o.timestamp;
+        aperture = o.aperture;

-    if( ri ) {
-        delete ri;
-        ri = NULL;
+        if( ri ) {
+            delete ri;
+            ri = NULL;
+        }
    }

    return *this;