diff --git a/modules/structured_light/src/graycodepattern.cpp b/modules/structured_light/src/graycodepattern.cpp index 5bd6862cb..a6a8288c3 100644 --- a/modules/structured_light/src/graycodepattern.cpp +++ b/modules/structured_light/src/graycodepattern.cpp @@ -43,36 +43,36 @@ namespace cv { namespace structured_light { -class CV_EXPORTS_W GrayCodePattern_Impl : public GrayCodePattern +class CV_EXPORTS_W GrayCodePattern_Impl CV_FINAL : public GrayCodePattern { public: // Constructor explicit GrayCodePattern_Impl( const GrayCodePattern::Params ¶meters = GrayCodePattern::Params() ); // Destructor - virtual ~GrayCodePattern_Impl(){}; + virtual ~GrayCodePattern_Impl() CV_OVERRIDE {}; // Generates the gray code pattern as a std::vector - bool generate( OutputArrayOfArrays patternImages ); + bool generate( OutputArrayOfArrays patternImages ) CV_OVERRIDE; // Decodes the gray code pattern, computing the disparity map bool decode( const std::vector< std::vector >& patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(), - InputArrayOfArrays whiteImages = noArray(), int flags = DECODE_3D_UNDERWORLD ) const; + InputArrayOfArrays whiteImages = noArray(), int flags = DECODE_3D_UNDERWORLD ) const CV_OVERRIDE; // Returns the number of pattern images for the graycode pattern - size_t getNumberOfPatternImages() const; + size_t getNumberOfPatternImages() const CV_OVERRIDE; // Sets the value for black threshold - void setBlackThreshold( size_t val ); + void setBlackThreshold( size_t val ) CV_OVERRIDE; // Sets the value for set the value for white threshold - void setWhiteThreshold( size_t val ); + void setWhiteThreshold( size_t val ) CV_OVERRIDE; // Generates the images needed for shadowMasks computation - void getImagesForShadowMasks( InputOutputArray blackImage, InputOutputArray whiteImage ) const; + void getImagesForShadowMasks( InputOutputArray blackImage, InputOutputArray whiteImage ) const CV_OVERRIDE; // For a (x,y) pixel of the camera returns the corresponding projector pixel - bool getProjPixel(InputArrayOfArrays patternImages, int x, int y, Point &projPix) const; + bool getProjPixel(InputArrayOfArrays patternImages, int x, int y, Point &projPix) const CV_OVERRIDE; private: // Parameters diff --git a/modules/structured_light/src/sinusoidalpattern.cpp b/modules/structured_light/src/sinusoidalpattern.cpp index 22e3f1f16..38820b9bd 100644 --- a/modules/structured_light/src/sinusoidalpattern.cpp +++ b/modules/structured_light/src/sinusoidalpattern.cpp @@ -44,37 +44,37 @@ namespace cv { namespace structured_light { -class CV_EXPORTS_W SinusoidalPatternProfilometry_Impl : public SinusoidalPattern +class CV_EXPORTS_W SinusoidalPatternProfilometry_Impl CV_FINAL : public SinusoidalPattern { public: // Constructor explicit SinusoidalPatternProfilometry_Impl( const SinusoidalPattern::Params ¶meters = SinusoidalPattern::Params() ); // Destructor - virtual ~SinusoidalPatternProfilometry_Impl(){}; + virtual ~SinusoidalPatternProfilometry_Impl() CV_OVERRIDE {}; // Generate sinusoidal patterns - bool generate( OutputArrayOfArrays patternImages ); + bool generate( OutputArrayOfArrays patternImages ) CV_OVERRIDE; bool decode( const std::vector< std::vector >& patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(), InputArrayOfArrays whiteImages = - noArray(), int flags = 0 ) const; + noArray(), int flags = 0 ) const CV_OVERRIDE; // Compute a wrapped phase map from the sinusoidal patterns void computePhaseMap( InputArrayOfArrays patternImages, OutputArray wrappedPhaseMap, - OutputArray shadowMask = noArray(), InputArray fundamental = noArray()); + OutputArray shadowMask = noArray(), InputArray fundamental = noArray()) CV_OVERRIDE; // Unwrap the wrapped phase map to retrieve correspondences void unwrapPhaseMap( InputArray wrappedPhaseMap, OutputArray unwrappedPhaseMap, cv::Size camSize, - InputArray shadowMask = noArray() ); + InputArray shadowMask = noArray() ) CV_OVERRIDE; // Find correspondences between the devices void findProCamMatches( InputArray projUnwrappedPhaseMap, InputArray camUnwrappedPhaseMap, - OutputArrayOfArrays matches ); + OutputArrayOfArrays matches ) CV_OVERRIDE; void computeDataModulationTerm( InputArrayOfArrays patternImages, OutputArray dataModulationTerm, - InputArray shadowMask ); + InputArray shadowMask ) CV_OVERRIDE; private: // Compute The Fourier transform of a pattern. Output is complex. Taken from the DFT example in OpenCV