diff --git a/modules/rgbd/include/opencv2/rgbd.hpp b/modules/rgbd/include/opencv2/rgbd.hpp index 83674c042..5d90e983d 100755 --- a/modules/rgbd/include/opencv2/rgbd.hpp +++ b/modules/rgbd/include/opencv2/rgbd.hpp @@ -514,7 +514,7 @@ namespace rgbd CV_WRAP static Ptr 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& minGradientMagnitudes = std::vector(), float maxPointsPart = Odometry::DEFAULT_MAX_POINTS_PART(), int transformType = Odometry::RIGID_BODY_MOTION); - CV_WRAP virtual Size prepareFrameCache(Ptr& frame, int cacheType) const; + CV_WRAP virtual Size prepareFrameCache(Ptr& 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& srcFrame, const Ptr& 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& iterCounts = std::vector(), int transformType = Odometry::RIGID_BODY_MOTION); - CV_WRAP virtual Size prepareFrameCache(Ptr& frame, int cacheType) const; + CV_WRAP virtual Size prepareFrameCache(Ptr& 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& srcFrame, const Ptr& 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& minGradientMagnitudes = std::vector(), int transformType = Odometry::RIGID_BODY_MOTION); - CV_WRAP virtual Size prepareFrameCache(Ptr& frame, int cacheType) const; + CV_WRAP virtual Size prepareFrameCache(Ptr& 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& srcFrame, const Ptr& 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*/ diff --git a/modules/rgbd/include/opencv2/rgbd/linemod.hpp b/modules/rgbd/include/opencv2/rgbd/linemod.hpp index 8d6f2e30c..8e222660f 100644 --- a/modules/rgbd/include/opencv2/rgbd/linemod.hpp +++ b/modules/rgbd/include/opencv2/rgbd/linemod.hpp @@ -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 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 processImpl(const Mat& src, - const Mat& mask) const; + const Mat& mask) const CV_OVERRIDE; }; /** diff --git a/modules/rgbd/src/depth_cleaner.cpp b/modules/rgbd/src/depth_cleaner.cpp index 70616e5c0..ca6ba9d55 100644 --- a/modules/rgbd/src/depth_cleaner.cpp +++ b/modules/rgbd/src/depth_cleaner.cpp @@ -93,7 +93,7 @@ namespace rgbd /** Compute cached data */ virtual void - cache() + cache() CV_OVERRIDE { } diff --git a/modules/rgbd/src/linemod.cpp b/modules/rgbd/src/linemod.cpp index f31cbef6a..9d0846b99 100644 --- a/modules/rgbd/src/linemod.cpp +++ b/modules/rgbd/src/linemod.cpp @@ -428,11 +428,11 @@ public: float weak_threshold, size_t num_features, 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: /// Recalculate angle and magnitude images @@ -728,11 +728,11 @@ public: int distance_threshold, int difference_threshold, size_t num_features, 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: Mat mask; diff --git a/modules/rgbd/src/normal.cpp b/modules/rgbd/src/normal.cpp index 2824a8e44..906c22d12 100644 --- a/modules/rgbd/src/normal.cpp +++ b/modules/rgbd/src/normal.cpp @@ -230,7 +230,7 @@ namespace rgbd /** Compute cached data */ virtual void - cache() + cache() CV_OVERRIDE { // Compute theta and phi according to equation 3 Mat cos_theta, sin_theta, cos_phi, sin_phi; @@ -360,7 +360,7 @@ multiply_by_K_inv(const Matx & K_inv, U a, U b, U c, Vec &res) /** Compute cached data */ virtual void - cache() + cache() CV_OVERRIDE { } @@ -516,7 +516,7 @@ multiply_by_K_inv(const Matx & K_inv, U a, U b, U c, Vec &res) /** Compute cached data */ virtual void - cache() + cache() CV_OVERRIDE { Mat_ cos_theta, sin_theta, cos_phi, sin_phi; computeThetaPhi(rows_, cols_, K_, cos_theta, sin_theta, cos_phi, sin_phi); diff --git a/modules/rgbd/src/plane.cpp b/modules/rgbd/src/plane.cpp index c765c029c..859d044f3 100644 --- a/modules/rgbd/src/plane.cpp +++ b/modules/rgbd/src/plane.cpp @@ -182,7 +182,7 @@ public: * @return */ float - distance(const Vec3f& p_j) const + distance(const Vec3f& p_j) const CV_OVERRIDE { 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 */ inline float - distance(const Vec3f& p_j) const + distance(const Vec3f& p_j) const CV_OVERRIDE { 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_; @@ -524,7 +524,7 @@ private: unsigned char plane_index_; /** THe block size as defined in the main algorithm */ int block_size_; - + const InlierFinder & operator = (const InlierFinder &); };