Warning fixes continued

modules/stitching/include/opencv2/stitching/detail/blenders.hpp

@@ -58,7 +58,7 @@ public:
     enum { NO, FEATHER, MULTI_BAND };
     static Ptr<Blender> createDefault(int type, bool try_gpu = false);
 
-    void prepare(const std::vector<Point> &corners, const std::vector<Size> &sizes);    
+    void prepare(const std::vector<Point> &corners, const std::vector<Size> &sizes);
     virtual void prepare(Rect dst_roi);
     virtual void feed(const Mat &img, const Mat &mask, Point tl);
     virtual void blend(Mat &dst, Mat &dst_mask);
@@ -72,7 +72,7 @@ protected:
 class CV_EXPORTS FeatherBlender : public Blender
 {
 public:
-    FeatherBlender(float sharpness = 0.02f) { setSharpness(sharpness); }
+    FeatherBlender(float sharpness = 0.02f);
 
     float sharpness() const { return sharpness_; }
     void setSharpness(float val) { sharpness_ = val; }
@@ -92,6 +92,8 @@ private:
     Mat dst_weight_map_;
 };
 
+inline FeatherBlender::FeatherBlender(float _sharpness) { setSharpness(_sharpness); }
+
 
 class CV_EXPORTS MultiBandBlender : public Blender
 {

modules/stitching/include/opencv2/stitching/detail/util.hpp

@@ -75,8 +75,8 @@
         {                                      \
             LOG_STITCHING_MSG(_msg);           \
         }                                      \
-		break;                                 \
-    } 
+    break;                                 \
+    }
 
 
 #define LOG(msg) LOG_(1, msg)
@@ -115,8 +115,7 @@ private:
 
 struct CV_EXPORTS GraphEdge
 {
-    GraphEdge(int from, int to, float weight) 
-        : from(from), to(to), weight(weight) {}
+    GraphEdge(int from, int to, float weight);
     bool operator <(const GraphEdge& other) const { return weight < other.weight; }
     bool operator >(const GraphEdge& other) const { return weight > other.weight; }
 
@@ -124,6 +123,8 @@ struct CV_EXPORTS GraphEdge
     float weight;
 };
 
+inline GraphEdge::GraphEdge(int _from, int _to, float _weight) : from(_from), to(_to), weight(_weight) {}
+
 
 class CV_EXPORTS Graph
 {
@@ -134,7 +135,7 @@ public:
     void addEdge(int from, int to, float weight);
     template <typename B> B forEach(B body) const;
     template <typename B> B walkBreadthFirst(int from, B body) const;
-    
+
 private:
     std::vector< std::list<GraphEdge> > edges_;
 };

modules/stitching/include/opencv2/stitching/stitcher.hpp

@@ -103,9 +103,9 @@ public:
 
     const cv::Mat& matchingMask() const { return matching_mask_; }
     void setMatchingMask(const cv::Mat &mask)
-    { 
+    {
         CV_Assert(mask.type() == CV_8U && mask.cols == mask.rows);
-        matching_mask_ = mask.clone(); 
+        matching_mask_ = mask.clone();
     }
 
     Ptr<detail::BundleAdjusterBase> bundleAdjuster() { return bundle_adjuster_; }
@@ -115,7 +115,7 @@ public:
 
     Ptr<WarperCreator> warper() { return warper_; }
     const Ptr<WarperCreator> warper() const { return warper_; }
-    void setWarper(Ptr<WarperCreator> warper) { warper_ = warper; }
+    void setWarper(Ptr<WarperCreator> creator) { warper_ = creator; }
 
     Ptr<detail::ExposureCompensator> exposureCompensator() { return exposure_comp_; }
     const Ptr<detail::ExposureCompensator> exposureCompensator() const { return exposure_comp_; }
@@ -128,7 +128,7 @@ public:
 
     Ptr<detail::Blender> blender() { return blender_; }
     const Ptr<detail::Blender> blender() const { return blender_; }
-    void setBlender(Ptr<detail::Blender> blender) { blender_ = blender; }
+    void setBlender(Ptr<detail::Blender> b) { blender_ = b; }
 
 private:
     Stitcher() {}