Merged the trunk r8589:8653 - all changes related to build warnings

modules/videostab/include/opencv2/videostab/fast_marching.hpp

@@ -73,7 +73,7 @@ private:
         int x, y;
 
         DXY() : dist(0), x(0), y(0) {}
-        DXY(float dist, int x, int y) : dist(dist), x(x), y(y) {}
+        DXY(float _dist, int _x, int _y) : dist(_dist), x(_x), y(_y) {}
         bool operator <(const DXY &dxy) const { return dist < dxy.dist; }
     };
 

modules/videostab/include/opencv2/videostab/global_motion.hpp

@@ -72,8 +72,8 @@ struct CV_EXPORTS RansacParams
     float eps; // max outliers ratio
     float prob; // probability of success
 
-    RansacParams(int size, float thresh, float eps, float prob)
-        : size(size), thresh(thresh), eps(eps), prob(prob) {}
+    RansacParams(int _size, float _thresh, float _eps, float _prob)
+        : size(_size), thresh(_thresh), eps(_eps), prob(_prob) {}
 
     static RansacParams translationMotionStd() { return RansacParams(2, 0.5f, 0.5f, 0.99f); }
     static RansacParams translationAndScale2dMotionStd() { return RansacParams(3, 0.5f, 0.5f, 0.99f); }

modules/videostab/include/opencv2/videostab/inpainting.hpp

@@ -175,8 +175,8 @@ private:
 class CV_EXPORTS ColorInpainter : public InpainterBase
 {
 public:
-    ColorInpainter(int method = INPAINT_TELEA, double radius = 2.)
-        : method_(method), radius_(radius) {}
+    ColorInpainter(int method = INPAINT_TELEA, double _radius = 2.)
+        : method_(method), radius_(_radius) {}
 
     virtual void inpaint(int idx, Mat &frame, Mat &mask);
 

modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp

@@ -55,6 +55,10 @@ class CV_EXPORTS IMotionStabilizer
 {
 public:
     virtual void stabilize(const Mat *motions, int size, Mat *stabilizationMotions) const = 0;
+
+#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
+    virtual ~IMotionStabilizer() {}
+#endif
 };
 
 class CV_EXPORTS MotionFilterBase : public IMotionStabilizer

modules/videostab/include/opencv2/videostab/optical_flow.hpp

@@ -46,7 +46,7 @@
 #include "opencv2/core/core.hpp"
 #include "opencv2/opencv_modules.hpp"
 
-#if HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_GPU
 #  include "opencv2/gpu/gpu.hpp"
 #endif
 
@@ -98,7 +98,7 @@ public:
             OutputArray status, OutputArray errors);
 };
 
-#if HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_GPU
 class CV_EXPORTS DensePyrLkOptFlowEstimatorGpu
         : public PyrLkOptFlowEstimatorBase, public IDenseOptFlowEstimator
 {

modules/videostab/include/opencv2/videostab/stabilizer.hpp

@@ -63,7 +63,7 @@ class CV_EXPORTS StabilizerBase
 public:
     virtual ~StabilizerBase() {}
 
-    void setLog(Ptr<ILog> log) { log_ = log; }
+    void setLog(Ptr<ILog> _log) { log_ = _log; }
     Ptr<ILog> log() const { return log_; }
 
     void setRadius(int val) { radius_ = val; }