From fb06a75c81b02b11ad21d3e8f153bf206fb6a470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com>
Date: Sun, 17 Sep 2017 11:06:11 +0200
Subject: [PATCH] Fix clang warnings on new lensfun code (fixes #4086)

---
 rtengine/iptransform.cc    | 2 +-
 rtengine/rawimagesource.cc | 2 +-
 rtengine/rtlensfun.h       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index 1cafac7a9..d3e6ca759 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -307,7 +307,7 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
     std::unique_ptr<const LensCorrection> pLCPMap;
 
     if (needsLensfun()) {
-        pLCPMap = std::move(LFDatabase::findModifier(params->lensProf, metadata, oW, oH, params->coarse, rawRotationDeg));
+        pLCPMap = LFDatabase::findModifier(params->lensProf, metadata, oW, oH, params->coarse, rawRotationDeg);
     } else if (needsLCP()) { // don't check focal length to allow distortion correction for lenses without chip
         const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile (params->lensProf.lcpFile);
 
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 1b29b352a..a1f157871 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1858,7 +1858,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
     if (!hasFlatField && lensProf.useVign) {
         std::unique_ptr<LensCorrection> pmap;
         if (lensProf.useLensfun()) {
-            pmap = std::move(LFDatabase::findModifier(lensProf, idata, W, H, coarse, -1));
+            pmap = LFDatabase::findModifier(lensProf, idata, W, H, coarse, -1);
         } else {
             const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile(lensProf.lcpFile);
 
diff --git a/rtengine/rtlensfun.h b/rtengine/rtlensfun.h
index d1cfd0ec4..303c9a45a 100644
--- a/rtengine/rtlensfun.h
+++ b/rtengine/rtlensfun.h
@@ -46,7 +46,7 @@ public:
     bool isCACorrectionAvailable() const override;
     void correctCA(double &x, double &y, int channel) const override;
     void processVignetteLine(int width, int y, float *line) const override;
-    void processVignetteLine3Channels(int width, int y, float *line) const;
+    void processVignetteLine3Channels(int width, int y, float *line) const override;
 
     Glib::ustring getDisplayString() const;
 
@@ -118,7 +118,7 @@ private:
                                             int width, int height, bool swap_xy) const;
     LFDatabase();
     bool LoadDirectory(const char *dirname);
-    
+
     static LFDatabase instance_;
     lfDatabase *data_;
 };