opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 19:44:14 +08:00
Code Issues Releases Wiki Activity

rgbd: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-21 16:58:16 +03:00
parent 3dd79d6889
commit 5d0a12833b
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
modules/rgbd/include/opencv2/rgbd.hpp
View File

@@ -514,7 +514,7 @@ namespace rgbd
CV_WRAP static Ptr<OdometryFrame> create(const Mat& image=Mat(), const Mat& depth=Mat(), const Mat& mask=Mat(), const Mat& normals=Mat(), int ID=-1);
CV_WRAP virtual void
release();
release() CV_OVERRIDE;
CV_WRAP void
releasePyramids();
@@ -661,13 +661,13 @@ namespace rgbd
const std::vector<float>& minGradientMagnitudes = std::vector<float>(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(),
int transformType = Odometry::RIGID_BODY_MOTION);
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const CV_OVERRIDE;
CV_WRAP cv::Mat getCameraMatrix() const
CV_WRAP cv::Mat getCameraMatrix() const CV_OVERRIDE
{
return cameraMatrix;
}
CV_WRAP void setCameraMatrix(const cv::Mat &val)
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
{
cameraMatrix = val;
}
@@ -719,11 +719,11 @@ namespace rgbd
{
maxPointsPart = val;
}
CV_WRAP int getTransformType() const
CV_WRAP int getTransformType() const CV_OVERRIDE
{
return transformType;
}
CV_WRAP void setTransformType(int val)
CV_WRAP void setTransformType(int val) CV_OVERRIDE
{
transformType = val;
}
@@ -746,11 +746,11 @@ namespace rgbd
protected:
virtual void
checkParams() const;
checkParams() const CV_OVERRIDE;
virtual bool
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
const Mat& initRt) const;
const Mat& initRt) const CV_OVERRIDE;
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
/*float*/
@@ -792,13 +792,13 @@ namespace rgbd
float maxDepthDiff = Odometry::DEFAULT_MAX_DEPTH_DIFF(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(),
const std::vector<int>& iterCounts = std::vector<int>(), int transformType = Odometry::RIGID_BODY_MOTION);
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const CV_OVERRIDE;
CV_WRAP cv::Mat getCameraMatrix() const
CV_WRAP cv::Mat getCameraMatrix() const CV_OVERRIDE
{
return cameraMatrix;
}
CV_WRAP void setCameraMatrix(const cv::Mat &val)
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
{
cameraMatrix = val;
}
@@ -842,11 +842,11 @@ namespace rgbd
{
maxPointsPart = val;
}
CV_WRAP int getTransformType() const
CV_WRAP int getTransformType() const CV_OVERRIDE
{
return transformType;
}
CV_WRAP void setTransformType(int val)
CV_WRAP void setTransformType(int val) CV_OVERRIDE
{
transformType = val;
}
@@ -873,11 +873,11 @@ namespace rgbd
protected:
virtual void
checkParams() const;
checkParams() const CV_OVERRIDE;
virtual bool
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
const Mat& initRt) const;
const Mat& initRt) const CV_OVERRIDE;
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
/*float*/
@@ -926,13 +926,13 @@ namespace rgbd
const std::vector<float>& minGradientMagnitudes = std::vector<float>(),
int transformType = Odometry::RIGID_BODY_MOTION);
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
CV_WRAP virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const CV_OVERRIDE;
CV_WRAP cv::Mat getCameraMatrix() const
CV_WRAP cv::Mat getCameraMatrix() const CV_OVERRIDE
{
return cameraMatrix;
}
CV_WRAP void setCameraMatrix(const cv::Mat &val)
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
{
cameraMatrix = val;
}
@@ -984,11 +984,11 @@ namespace rgbd
{
minGradientMagnitudes = val;
}
CV_WRAP int getTransformType() const
CV_WRAP int getTransformType() const CV_OVERRIDE
{
return transformType;
}
CV_WRAP void setTransformType(int val)
CV_WRAP void setTransformType(int val) CV_OVERRIDE
{
transformType = val;
}
@@ -1015,11 +1015,11 @@ namespace rgbd
protected:
virtual void
checkParams() const;
checkParams() const CV_OVERRIDE;
virtual bool
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
const Mat& initRt) const;
const Mat& initRt) const CV_OVERRIDE;
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
/*float*/

16
modules/rgbd/include/opencv2/rgbd/linemod.hpp
View File

@@ -218,10 +218,10 @@ public:
*/
ColorGradient(float weak_threshold, size_t num_features, float strong_threshold);
virtual String name() const;
virtual String name() const CV_OVERRIDE;
virtual void read(const FileNode& fn);
virtual void write(FileStorage& fs) const;
virtual void read(const FileNode& fn) CV_OVERRIDE;
virtual void write(FileStorage& fs) const CV_OVERRIDE;
float weak_threshold;
size_t num_features;
@@ -229,7 +229,7 @@ public:
protected:
virtual Ptr<QuantizedPyramid> processImpl(const Mat& src,
const Mat& mask) const;
const Mat& mask) const CV_OVERRIDE;
};
/**
@@ -256,10 +256,10 @@ public:
DepthNormal(int distance_threshold, int difference_threshold, size_t num_features,
int extract_threshold);
virtual String name() const;
virtual String name() const CV_OVERRIDE;
virtual void read(const FileNode& fn);
virtual void write(FileStorage& fs) const;
virtual void read(const FileNode& fn) CV_OVERRIDE;
virtual void write(FileStorage& fs) const CV_OVERRIDE;
int distance_threshold;
int difference_threshold;
@@ -268,7 +268,7 @@ public:
protected:
virtual Ptr<QuantizedPyramid> processImpl(const Mat& src,
const Mat& mask) const;
const Mat& mask) const CV_OVERRIDE;
};
/**