commit x64 compilation from lulu cause the other branch dont seems to compile properly at home
This commit is contained in:
@ -40,8 +40,8 @@
|
||||
//
|
||||
//M*/
|
||||
|
||||
#ifndef __OPENCV_VIDEOSTAB_INPAINTINT_HPP__
|
||||
#define __OPENCV_VIDEOSTAB_INPAINTINT_HPP__
|
||||
#ifndef OPENCV_VIDEOSTAB_INPAINTINT_HPP
|
||||
#define OPENCV_VIDEOSTAB_INPAINTINT_HPP
|
||||
|
||||
#include <vector>
|
||||
#include "opencv2/core.hpp"
|
||||
@ -102,7 +102,7 @@ protected:
|
||||
class CV_EXPORTS NullInpainter : public InpainterBase
|
||||
{
|
||||
public:
|
||||
virtual void inpaint(int /*idx*/, Mat &/*frame*/, Mat &/*mask*/) {}
|
||||
virtual void inpaint(int /*idx*/, Mat &/*frame*/, Mat &/*mask*/) CV_OVERRIDE {}
|
||||
};
|
||||
|
||||
class CV_EXPORTS InpaintingPipeline : public InpainterBase
|
||||
@ -111,14 +111,14 @@ public:
|
||||
void pushBack(Ptr<InpainterBase> inpainter) { inpainters_.push_back(inpainter); }
|
||||
bool empty() const { return inpainters_.empty(); }
|
||||
|
||||
virtual void setRadius(int val);
|
||||
virtual void setMotionModel(MotionModel val);
|
||||
virtual void setFrames(const std::vector<Mat> &val);
|
||||
virtual void setMotions(const std::vector<Mat> &val);
|
||||
virtual void setStabilizedFrames(const std::vector<Mat> &val);
|
||||
virtual void setStabilizationMotions(const std::vector<Mat> &val);
|
||||
virtual void setRadius(int val) CV_OVERRIDE;
|
||||
virtual void setMotionModel(MotionModel val) CV_OVERRIDE;
|
||||
virtual void setFrames(const std::vector<Mat> &val) CV_OVERRIDE;
|
||||
virtual void setMotions(const std::vector<Mat> &val) CV_OVERRIDE;
|
||||
virtual void setStabilizedFrames(const std::vector<Mat> &val) CV_OVERRIDE;
|
||||
virtual void setStabilizationMotions(const std::vector<Mat> &val) CV_OVERRIDE;
|
||||
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask);
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
std::vector<Ptr<InpainterBase> > inpainters_;
|
||||
@ -132,7 +132,7 @@ public:
|
||||
void setStdevThresh(float val) { stdevThresh_ = val; }
|
||||
float stdevThresh() const { return stdevThresh_; }
|
||||
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask);
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
float stdevThresh_;
|
||||
@ -155,7 +155,7 @@ public:
|
||||
void setBorderMode(int val) { borderMode_ = val; }
|
||||
int borderMode() const { return borderMode_; }
|
||||
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask);
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
FastMarchingMethod fmm_;
|
||||
@ -174,7 +174,7 @@ private:
|
||||
class CV_EXPORTS ColorAverageInpainter : public InpainterBase
|
||||
{
|
||||
public:
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask);
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
FastMarchingMethod fmm_;
|
||||
@ -185,7 +185,7 @@ class CV_EXPORTS ColorInpainter : public InpainterBase
|
||||
public:
|
||||
ColorInpainter(int method = INPAINT_TELEA, double radius = 2.);
|
||||
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask);
|
||||
virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
int method_;
|
||||
|
||||
Reference in New Issue
Block a user