mirror of
https://github.com/opencv/opencv_contrib.git
synced 2025-10-20 12:55:15 +08:00
rgbd: apply CV_OVERRIDE/CV_FINAL
This commit is contained in:
@@ -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 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
|
CV_WRAP virtual void
|
||||||
release();
|
release() CV_OVERRIDE;
|
||||||
|
|
||||||
CV_WRAP void
|
CV_WRAP void
|
||||||
releasePyramids();
|
releasePyramids();
|
||||||
@@ -661,13 +661,13 @@ namespace rgbd
|
|||||||
const std::vector<float>& minGradientMagnitudes = std::vector<float>(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(),
|
const std::vector<float>& minGradientMagnitudes = std::vector<float>(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(),
|
||||||
int transformType = Odometry::RIGID_BODY_MOTION);
|
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;
|
return cameraMatrix;
|
||||||
}
|
}
|
||||||
CV_WRAP void setCameraMatrix(const cv::Mat &val)
|
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
cameraMatrix = val;
|
cameraMatrix = val;
|
||||||
}
|
}
|
||||||
@@ -719,11 +719,11 @@ namespace rgbd
|
|||||||
{
|
{
|
||||||
maxPointsPart = val;
|
maxPointsPart = val;
|
||||||
}
|
}
|
||||||
CV_WRAP int getTransformType() const
|
CV_WRAP int getTransformType() const CV_OVERRIDE
|
||||||
{
|
{
|
||||||
return transformType;
|
return transformType;
|
||||||
}
|
}
|
||||||
CV_WRAP void setTransformType(int val)
|
CV_WRAP void setTransformType(int val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
transformType = val;
|
transformType = val;
|
||||||
}
|
}
|
||||||
@@ -746,11 +746,11 @@ namespace rgbd
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void
|
virtual void
|
||||||
checkParams() const;
|
checkParams() const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
|
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.
|
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
|
||||||
/*float*/
|
/*float*/
|
||||||
@@ -792,13 +792,13 @@ namespace rgbd
|
|||||||
float maxDepthDiff = Odometry::DEFAULT_MAX_DEPTH_DIFF(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(),
|
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);
|
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;
|
return cameraMatrix;
|
||||||
}
|
}
|
||||||
CV_WRAP void setCameraMatrix(const cv::Mat &val)
|
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
cameraMatrix = val;
|
cameraMatrix = val;
|
||||||
}
|
}
|
||||||
@@ -842,11 +842,11 @@ namespace rgbd
|
|||||||
{
|
{
|
||||||
maxPointsPart = val;
|
maxPointsPart = val;
|
||||||
}
|
}
|
||||||
CV_WRAP int getTransformType() const
|
CV_WRAP int getTransformType() const CV_OVERRIDE
|
||||||
{
|
{
|
||||||
return transformType;
|
return transformType;
|
||||||
}
|
}
|
||||||
CV_WRAP void setTransformType(int val)
|
CV_WRAP void setTransformType(int val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
transformType = val;
|
transformType = val;
|
||||||
}
|
}
|
||||||
@@ -873,11 +873,11 @@ namespace rgbd
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void
|
virtual void
|
||||||
checkParams() const;
|
checkParams() const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
|
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.
|
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
|
||||||
/*float*/
|
/*float*/
|
||||||
@@ -926,13 +926,13 @@ namespace rgbd
|
|||||||
const std::vector<float>& minGradientMagnitudes = std::vector<float>(),
|
const std::vector<float>& minGradientMagnitudes = std::vector<float>(),
|
||||||
int transformType = Odometry::RIGID_BODY_MOTION);
|
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;
|
return cameraMatrix;
|
||||||
}
|
}
|
||||||
CV_WRAP void setCameraMatrix(const cv::Mat &val)
|
CV_WRAP void setCameraMatrix(const cv::Mat &val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
cameraMatrix = val;
|
cameraMatrix = val;
|
||||||
}
|
}
|
||||||
@@ -984,11 +984,11 @@ namespace rgbd
|
|||||||
{
|
{
|
||||||
minGradientMagnitudes = val;
|
minGradientMagnitudes = val;
|
||||||
}
|
}
|
||||||
CV_WRAP int getTransformType() const
|
CV_WRAP int getTransformType() const CV_OVERRIDE
|
||||||
{
|
{
|
||||||
return transformType;
|
return transformType;
|
||||||
}
|
}
|
||||||
CV_WRAP void setTransformType(int val)
|
CV_WRAP void setTransformType(int val) CV_OVERRIDE
|
||||||
{
|
{
|
||||||
transformType = val;
|
transformType = val;
|
||||||
}
|
}
|
||||||
@@ -1015,11 +1015,11 @@ namespace rgbd
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void
|
virtual void
|
||||||
checkParams() const;
|
checkParams() const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
computeImpl(const Ptr<OdometryFrame>& srcFrame, const Ptr<OdometryFrame>& dstFrame, OutputArray Rt,
|
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.
|
// Some params have commented desired type. It's due to AlgorithmInfo::addParams does not support it now.
|
||||||
/*float*/
|
/*float*/
|
||||||
|
@@ -218,10 +218,10 @@ public:
|
|||||||
*/
|
*/
|
||||||
ColorGradient(float weak_threshold, size_t num_features, float strong_threshold);
|
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 read(const FileNode& fn) CV_OVERRIDE;
|
||||||
virtual void write(FileStorage& fs) const;
|
virtual void write(FileStorage& fs) const CV_OVERRIDE;
|
||||||
|
|
||||||
float weak_threshold;
|
float weak_threshold;
|
||||||
size_t num_features;
|
size_t num_features;
|
||||||
@@ -229,7 +229,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual Ptr<QuantizedPyramid> processImpl(const Mat& src,
|
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,
|
DepthNormal(int distance_threshold, int difference_threshold, size_t num_features,
|
||||||
int extract_threshold);
|
int extract_threshold);
|
||||||
|
|
||||||
virtual String name() const;
|
virtual String name() const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual void read(const FileNode& fn);
|
virtual void read(const FileNode& fn) CV_OVERRIDE;
|
||||||
virtual void write(FileStorage& fs) const;
|
virtual void write(FileStorage& fs) const CV_OVERRIDE;
|
||||||
|
|
||||||
int distance_threshold;
|
int distance_threshold;
|
||||||
int difference_threshold;
|
int difference_threshold;
|
||||||
@@ -268,7 +268,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual Ptr<QuantizedPyramid> processImpl(const Mat& src,
|
virtual Ptr<QuantizedPyramid> processImpl(const Mat& src,
|
||||||
const Mat& mask) const;
|
const Mat& mask) const CV_OVERRIDE;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -93,7 +93,7 @@ namespace rgbd
|
|||||||
/** Compute cached data
|
/** Compute cached data
|
||||||
*/
|
*/
|
||||||
virtual void
|
virtual void
|
||||||
cache()
|
cache() CV_OVERRIDE
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -428,11 +428,11 @@ public:
|
|||||||
float weak_threshold, size_t num_features,
|
float weak_threshold, size_t num_features,
|
||||||
float strong_threshold);
|
float strong_threshold);
|
||||||
|
|
||||||
virtual void quantize(Mat& dst) const;
|
virtual void quantize(Mat& dst) const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual bool extractTemplate(Template& templ) const;
|
virtual bool extractTemplate(Template& templ) const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual void pyrDown();
|
virtual void pyrDown() CV_OVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Recalculate angle and magnitude images
|
/// Recalculate angle and magnitude images
|
||||||
@@ -728,11 +728,11 @@ public:
|
|||||||
int distance_threshold, int difference_threshold, size_t num_features,
|
int distance_threshold, int difference_threshold, size_t num_features,
|
||||||
int extract_threshold);
|
int extract_threshold);
|
||||||
|
|
||||||
virtual void quantize(Mat& dst) const;
|
virtual void quantize(Mat& dst) const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual bool extractTemplate(Template& templ) const;
|
virtual bool extractTemplate(Template& templ) const CV_OVERRIDE;
|
||||||
|
|
||||||
virtual void pyrDown();
|
virtual void pyrDown() CV_OVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Mat mask;
|
Mat mask;
|
||||||
|
@@ -230,7 +230,7 @@ namespace rgbd
|
|||||||
/** Compute cached data
|
/** Compute cached data
|
||||||
*/
|
*/
|
||||||
virtual void
|
virtual void
|
||||||
cache()
|
cache() CV_OVERRIDE
|
||||||
{
|
{
|
||||||
// Compute theta and phi according to equation 3
|
// Compute theta and phi according to equation 3
|
||||||
Mat cos_theta, sin_theta, cos_phi, sin_phi;
|
Mat cos_theta, sin_theta, cos_phi, sin_phi;
|
||||||
@@ -360,7 +360,7 @@ multiply_by_K_inv(const Matx<T, 3, 3> & K_inv, U a, U b, U c, Vec<T, 3> &res)
|
|||||||
/** Compute cached data
|
/** Compute cached data
|
||||||
*/
|
*/
|
||||||
virtual void
|
virtual void
|
||||||
cache()
|
cache() CV_OVERRIDE
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -516,7 +516,7 @@ multiply_by_K_inv(const Matx<T, 3, 3> & K_inv, U a, U b, U c, Vec<T, 3> &res)
|
|||||||
/** Compute cached data
|
/** Compute cached data
|
||||||
*/
|
*/
|
||||||
virtual void
|
virtual void
|
||||||
cache()
|
cache() CV_OVERRIDE
|
||||||
{
|
{
|
||||||
Mat_<T> cos_theta, sin_theta, cos_phi, sin_phi;
|
Mat_<T> cos_theta, sin_theta, cos_phi, sin_phi;
|
||||||
computeThetaPhi<T>(rows_, cols_, K_, cos_theta, sin_theta, cos_phi, sin_phi);
|
computeThetaPhi<T>(rows_, cols_, K_, cos_theta, sin_theta, cos_phi, sin_phi);
|
||||||
|
@@ -182,7 +182,7 @@ public:
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
float
|
float
|
||||||
distance(const Vec3f& p_j) const
|
distance(const Vec3f& p_j) const CV_OVERRIDE
|
||||||
{
|
{
|
||||||
return std::abs(float(p_j.dot(n_) + d_));
|
return std::abs(float(p_j.dot(n_) + d_));
|
||||||
}
|
}
|
||||||
@@ -206,7 +206,7 @@ public:
|
|||||||
/** The distance is now computed by taking the sensor error into account */
|
/** The distance is now computed by taking the sensor error into account */
|
||||||
inline
|
inline
|
||||||
float
|
float
|
||||||
distance(const Vec3f& p_j) const
|
distance(const Vec3f& p_j) const CV_OVERRIDE
|
||||||
{
|
{
|
||||||
float cst = p_j.dot(n_) + d_;
|
float cst = p_j.dot(n_) + d_;
|
||||||
float err = sensor_error_a_ * p_j[2] * p_j[2] + sensor_error_b_ * p_j[2] + sensor_error_c_;
|
float err = sensor_error_a_ * p_j[2] * p_j[2] + sensor_error_b_ * p_j[2] + sensor_error_c_;
|
||||||
|
Reference in New Issue
Block a user