From 05b97f5c5086add6293437d892311f6e06015eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com>
Date: Wed, 13 Sep 2017 19:58:48 +0200
Subject: [PATCH] Fix some new Coverity warnings

---
 rtengine/iptransform.cc | 29 ++++++++++++++++++-----------
 rtengine/lcp.cc         |  6 +++---
 rtgui/cacheimagedata.h  |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index 3f7472f6f..bfd01b301 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -789,18 +789,25 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
     bool enableCA = false;
 
     switch (mode) {
-    case ImProcFunctions::TRANSFORM_HIGH_QUALITY_FULLIMAGE:
-        enableLCPCA = pLCPMap && params->lensProf.useCA && pLCPMap->isCACorrectionAvailable();
-        // no break on purpose
-    case ImProcFunctions::TRANSFORM_HIGH_QUALITY:
-        enableLCPDist = pLCPMap && params->lensProf.useDist;
-        if (enableLCPCA) {
-            enableLCPDist = false;
+        case ImProcFunctions::TRANSFORM_HIGH_QUALITY_FULLIMAGE: {
+            enableLCPCA = pLCPMap && params->lensProf.useCA && pLCPMap->isCACorrectionAvailable();
+        }
+        //no break on purpose
+
+        case ImProcFunctions::TRANSFORM_HIGH_QUALITY: {
+            enableLCPDist = pLCPMap && params->lensProf.useDist;
+            if (enableLCPCA) {
+                enableLCPDist = false;
+            }
+            enableCA = enableLCPCA || needsCA();
+        }
+        //no break on purpose
+
+        default:
+        case ImProcFunctions::TRANSFORM_PREVIEW: {
+            enableLCPDist = pLCPMap && params->lensProf.useDist;
+            break;
         }
-        enableCA = enableLCPCA || needsCA();
-    default: // ImProcFunctions::TRANSFORM_PREVIEW
-        enableLCPDist = pLCPMap && params->lensProf.useDist;
-        break;
     }
 
     if (!enableCA) {
diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc
index 3a7c44000..3824d2b2f 100644
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@@ -650,8 +650,8 @@ int rtengine::LCPProfile::filterBadFrames(LCPCorrectionMode mode, double maxAvgD
             }
         }
 
-        if (settings->verbose) {
-            std::printf("Filtered %.1f%% frames for maxAvgDevFac %g leaving %i\n", filtered *100.f / count, maxAvgDevFac, count - filtered);
+        if (settings->verbose && count) {
+            std::printf("Filtered %.1f%% frames for maxAvgDevFac %g leaving %i\n", filtered * 100.f / count, maxAvgDevFac, count - filtered);
         }
     }
 
@@ -1030,7 +1030,7 @@ void rtengine::LCPMapper::correctDistortion(double &x, double &y, int cx, int cy
 {
     x += cx;
     y += cy;
-    
+
     if (isFisheye) {
         const double u = x * scale;
         const double v = y * scale;
diff --git a/rtgui/cacheimagedata.h b/rtgui/cacheimagedata.h
index e1c317508..63eebf25c 100644
--- a/rtgui/cacheimagedata.h
+++ b/rtgui/cacheimagedata.h
@@ -85,7 +85,7 @@ public:
     const rtexif::TagDirectory *getExifData() const { return NULL; }
     bool hasIPTC() const { return false; }
     const rtengine::procparams::IPTCPairs getIPTCData () const { return rtengine::procparams::IPTCPairs(); }
-    struct tm getDateTime () const { struct tm ret; return ret; }
+    tm getDateTime () const { return tm{}; }
     time_t getDateTimeAsTS() const { return time_t(-1); }
     int getISOSpeed() const { return iso; }
     double getFNumber() const { return fnumber; }