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_MOTION_STABILIZING_HPP__
|
||||
#define __OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP__
|
||||
#ifndef OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP
|
||||
#define OPENCV_VIDEOSTAB_MOTION_STABILIZING_HPP
|
||||
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
@ -75,7 +75,7 @@ public:
|
||||
|
||||
virtual void stabilize(
|
||||
int size, const std::vector<Mat> &motions, std::pair<int,int> range,
|
||||
Mat *stabilizationMotions);
|
||||
Mat *stabilizationMotions) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
std::vector<Ptr<IMotionStabilizer> > stabilizers_;
|
||||
@ -91,7 +91,7 @@ public:
|
||||
|
||||
virtual void stabilize(
|
||||
int size, const std::vector<Mat> &motions, std::pair<int,int> range,
|
||||
Mat *stabilizationMotions);
|
||||
Mat *stabilizationMotions) CV_OVERRIDE;
|
||||
};
|
||||
|
||||
class CV_EXPORTS GaussianMotionFilter : public MotionFilterBase
|
||||
@ -104,7 +104,7 @@ public:
|
||||
float stdev() const { return stdev_; }
|
||||
|
||||
virtual Mat stabilize(
|
||||
int idx, const std::vector<Mat> &motions, std::pair<int,int> range);
|
||||
int idx, const std::vector<Mat> &motions, std::pair<int,int> range) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
int radius_;
|
||||
@ -142,7 +142,7 @@ public:
|
||||
|
||||
virtual void stabilize(
|
||||
int size, const std::vector<Mat> &motions, std::pair<int,int> range,
|
||||
Mat *stabilizationMotions);
|
||||
Mat *stabilizationMotions) CV_OVERRIDE;
|
||||
|
||||
private:
|
||||
MotionModel model_;
|
||||
|
||||
Reference in New Issue
Block a user