From 23398bcb9532809d4f30df60d5a7bccdc2d3017e Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Tue, 20 Mar 2012 12:46:23 +0000 Subject: [PATCH] Fixed some warnings --- modules/videostab/include/opencv2/videostab/deblurring.hpp | 2 +- modules/videostab/include/opencv2/videostab/frame_source.hpp | 2 +- modules/videostab/include/opencv2/videostab/inpainting.hpp | 2 +- modules/videostab/include/opencv2/videostab/log.hpp | 2 +- modules/videostab/include/opencv2/videostab/stabilizer.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/videostab/include/opencv2/videostab/deblurring.hpp b/modules/videostab/include/opencv2/videostab/deblurring.hpp index 6e12243a17..2e881278af 100644 --- a/modules/videostab/include/opencv2/videostab/deblurring.hpp +++ b/modules/videostab/include/opencv2/videostab/deblurring.hpp @@ -84,7 +84,7 @@ protected: class CV_EXPORTS NullDeblurer : public IDeblurer { public: - virtual void deblur(int idx, Mat &frame) {} + virtual void deblur(int /*idx*/, Mat &/*frame*/) {} }; class CV_EXPORTS WeightingDeblurer : public IDeblurer diff --git a/modules/videostab/include/opencv2/videostab/frame_source.hpp b/modules/videostab/include/opencv2/videostab/frame_source.hpp index 24facb5cf3..c22c0a4cce 100644 --- a/modules/videostab/include/opencv2/videostab/frame_source.hpp +++ b/modules/videostab/include/opencv2/videostab/frame_source.hpp @@ -76,7 +76,7 @@ public: virtual void reset(); virtual Mat nextFrame(); - int frameCount() { return reader_.get(CV_CAP_PROP_FRAME_COUNT); } + int frameCount() { return static_cast(reader_.get(CV_CAP_PROP_FRAME_COUNT)); } double fps() { return reader_.get(CV_CAP_PROP_FPS); } private: diff --git a/modules/videostab/include/opencv2/videostab/inpainting.hpp b/modules/videostab/include/opencv2/videostab/inpainting.hpp index 1d83978ab9..b45eeb020e 100644 --- a/modules/videostab/include/opencv2/videostab/inpainting.hpp +++ b/modules/videostab/include/opencv2/videostab/inpainting.hpp @@ -91,7 +91,7 @@ protected: class CV_EXPORTS NullInpainter : public IInpainter { public: - virtual void inpaint(int idx, Mat &frame, Mat &mask) {} + virtual void inpaint(int /*idx*/, Mat &/*frame*/, Mat &/*mask*/) {} }; class CV_EXPORTS InpaintingPipeline : public IInpainter diff --git a/modules/videostab/include/opencv2/videostab/log.hpp b/modules/videostab/include/opencv2/videostab/log.hpp index 8f22b88905..474f37b561 100644 --- a/modules/videostab/include/opencv2/videostab/log.hpp +++ b/modules/videostab/include/opencv2/videostab/log.hpp @@ -60,7 +60,7 @@ public: class CV_EXPORTS NullLog : public ILog { public: - virtual void print(const char *format, ...) {} + virtual void print(const char */*format*/, ...) {} }; class CV_EXPORTS LogToStdout : public ILog diff --git a/modules/videostab/include/opencv2/videostab/stabilizer.hpp b/modules/videostab/include/opencv2/videostab/stabilizer.hpp index c04ff7478f..05a0cdf323 100644 --- a/modules/videostab/include/opencv2/videostab/stabilizer.hpp +++ b/modules/videostab/include/opencv2/videostab/stabilizer.hpp @@ -82,7 +82,7 @@ public: bool mustEstimateTrimRatio() const { return mustEstimateTrimRatio_; } void setTrimRatio(float val) { trimRatio_ = val; reset(); } - int trimRatio() const { return trimRatio_; } + float trimRatio() const { return trimRatio_; } void setInclusionConstraint(bool val) { inclusionConstraint_ = val; } bool inclusionConstraint() const { return inclusionConstraint_; }