From 97a855fcfc798ef31d62c22746576ddd3aa3757c Mon Sep 17 00:00:00 2001 From: Namgoo Lee Date: Wed, 1 Jun 2022 15:05:20 +0900 Subject: [PATCH] remove const from functions returning by value --- .../include/opencv2/bioinspired/retina.hpp | 6 +++--- .../bioinspired/transientareassegmentationmodule.hpp | 2 +- modules/bioinspired/src/retina.cpp | 12 ++++++------ modules/bioinspired/src/retina_ocl.cpp | 6 +++--- modules/bioinspired/src/retina_ocl.hpp | 6 +++--- .../src/transientareassegmentationmodule.cpp | 6 +++--- modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp | 2 +- modules/rgbd/include/opencv2/rgbd/dynafu.hpp | 2 +- modules/rgbd/include/opencv2/rgbd/kinfu.hpp | 2 +- modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp | 2 +- modules/rgbd/src/colored_kinfu.cpp | 4 ++-- modules/rgbd/src/dynafu.cpp | 4 ++-- modules/rgbd/src/kinfu.cpp | 4 ++-- modules/rgbd/src/large_kinfu.cpp | 4 ++-- modules/xfeatures2d/src/msd_pyramid.hpp | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/bioinspired/include/opencv2/bioinspired/retina.hpp b/modules/bioinspired/include/opencv2/bioinspired/retina.hpp index 91c81484ff..8e6eda93ca 100644 --- a/modules/bioinspired/include/opencv2/bioinspired/retina.hpp +++ b/modules/bioinspired/include/opencv2/bioinspired/retina.hpp @@ -251,7 +251,7 @@ class CV_EXPORTS_W Retina : public Algorithm { /** @brief Outputs a string showing the used parameters setup @return a string which contains formated parameters information */ - CV_WRAP virtual const String printSetup()=0; + CV_WRAP virtual String printSetup()=0; /** @brief Write xml/yml formated parameters information @param fs the filename of the xml file that will be open and writen with formatted parameters @@ -389,9 +389,9 @@ class CV_EXPORTS_W Retina : public Algorithm { CV_WRAP virtual void getMagnoRAW(OutputArray retinaOutput_magno)=0; /** @overload */ - CV_WRAP virtual const Mat getMagnoRAW() const=0; + CV_WRAP virtual Mat getMagnoRAW() const=0; /** @overload */ - CV_WRAP virtual const Mat getParvoRAW() const=0; + CV_WRAP virtual Mat getParvoRAW() const=0; /** @brief Activate color saturation as the final step of the color demultiplexing process -\> this saturation is a sigmoide function applied to each channel of the demultiplexed image. diff --git a/modules/bioinspired/include/opencv2/bioinspired/transientareassegmentationmodule.hpp b/modules/bioinspired/include/opencv2/bioinspired/transientareassegmentationmodule.hpp index d5f5b2fd1e..86799c2609 100644 --- a/modules/bioinspired/include/opencv2/bioinspired/transientareassegmentationmodule.hpp +++ b/modules/bioinspired/include/opencv2/bioinspired/transientareassegmentationmodule.hpp @@ -161,7 +161,7 @@ class CV_EXPORTS_W TransientAreasSegmentationModule: public Algorithm /** @brief parameters setup display method @return a string which contains formatted parameters information */ - CV_WRAP virtual const String printSetup()=0; + CV_WRAP virtual String printSetup()=0; /** @brief write xml/yml formated parameters information @param fs : the filename of the xml file that will be open and writen with formatted parameters information diff --git a/modules/bioinspired/src/retina.cpp b/modules/bioinspired/src/retina.cpp index fa6e582cef..15962f61ac 100644 --- a/modules/bioinspired/src/retina.cpp +++ b/modules/bioinspired/src/retina.cpp @@ -148,7 +148,7 @@ class RetinaImpl CV_FINAL : public Retina * parameters setup display method * @return a string which contains formatted parameters information */ - const String printSetup() CV_OVERRIDE; + String printSetup() CV_OVERRIDE; /** * write xml/yml formated parameters information @@ -233,8 +233,8 @@ class RetinaImpl CV_FINAL : public Retina void getMagnoRAW(OutputArray retinaOutput_magno) CV_OVERRIDE; // original API level data accessors : get buffers addresses from a Mat header, similar to getParvoRAW and getMagnoRAW... - const Mat getMagnoRAW() const CV_OVERRIDE; - const Mat getParvoRAW() const CV_OVERRIDE; + Mat getMagnoRAW() const CV_OVERRIDE; + Mat getParvoRAW() const CV_OVERRIDE; /** * activate color saturation as the final step of the color demultiplexing process @@ -445,7 +445,7 @@ void RetinaImpl::setup(RetinaParameters newConfiguration) } -const String RetinaImpl::printSetup() +String RetinaImpl::printSetup() { std::stringstream outmessage; @@ -692,14 +692,14 @@ void RetinaImpl::getParvoRAW(OutputArray parvoOutputBufferCopy) } // original API level data accessors : get buffers addresses... -const Mat RetinaImpl::getMagnoRAW() const { +Mat RetinaImpl::getMagnoRAW() const { CV_Assert(!_wasOCLRunCalled); // create a cv::Mat header for the valarray return Mat((int)_retinaFilter->getMovingContours().size(),1, CV_32F, (void*)get_data(_retinaFilter->getMovingContours())); } -const Mat RetinaImpl::getParvoRAW() const { +Mat RetinaImpl::getParvoRAW() const { CV_Assert(!_wasOCLRunCalled); if (_retinaFilter->getColorMode()) // check if color mode is enabled { diff --git a/modules/bioinspired/src/retina_ocl.cpp b/modules/bioinspired/src/retina_ocl.cpp index a161b36a4f..5bbda144c7 100644 --- a/modules/bioinspired/src/retina_ocl.cpp +++ b/modules/bioinspired/src/retina_ocl.cpp @@ -203,7 +203,7 @@ void RetinaOCLImpl::setup(cv::bioinspired::RetinaParameters newConfiguration) setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency, _retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k); } -const String RetinaOCLImpl::printSetup() +String RetinaOCLImpl::printSetup() { std::stringstream outmessage; @@ -448,8 +448,8 @@ void RetinaOCLImpl::getMagnoRAW(OutputArray retinaOutput_magno) // unimplemented interfaces: void RetinaOCLImpl::applyFastToneMapping(InputArray /*inputImage*/, OutputArray /*outputToneMappedImage*/) { NOT_IMPLEMENTED; } -const Mat RetinaOCLImpl::getMagnoRAW() const { NOT_IMPLEMENTED; } -const Mat RetinaOCLImpl::getParvoRAW() const { NOT_IMPLEMENTED; } +Mat RetinaOCLImpl::getMagnoRAW() const { NOT_IMPLEMENTED; } +Mat RetinaOCLImpl::getParvoRAW() const { NOT_IMPLEMENTED; } /////////////////////////////////////// ///////// BasicRetinaFilter /////////// diff --git a/modules/bioinspired/src/retina_ocl.hpp b/modules/bioinspired/src/retina_ocl.hpp index e02dfc4c41..e68948b50f 100644 --- a/modules/bioinspired/src/retina_ocl.hpp +++ b/modules/bioinspired/src/retina_ocl.hpp @@ -643,7 +643,7 @@ class RetinaOCLImpl CV_FINAL : public Retina RetinaParameters getParameters() CV_OVERRIDE; - const String printSetup() CV_OVERRIDE; + String printSetup() CV_OVERRIDE; virtual void write(String fs) const CV_OVERRIDE; virtual void write(FileStorage& fs) const CV_OVERRIDE; @@ -663,8 +663,8 @@ class RetinaOCLImpl CV_FINAL : public Retina void applyFastToneMapping(InputArray /*inputImage*/, OutputArray /*outputToneMappedImage*/) CV_OVERRIDE; void getParvoRAW(OutputArray /*retinaOutput_parvo*/) CV_OVERRIDE; void getMagnoRAW(OutputArray /*retinaOutput_magno*/) CV_OVERRIDE; - const Mat getMagnoRAW() const CV_OVERRIDE; - const Mat getParvoRAW() const CV_OVERRIDE; + Mat getMagnoRAW() const CV_OVERRIDE; + Mat getParvoRAW() const CV_OVERRIDE; protected: RetinaParameters _retinaParameters; diff --git a/modules/bioinspired/src/transientareassegmentationmodule.cpp b/modules/bioinspired/src/transientareassegmentationmodule.cpp index fd8672ed59..0f36d6dd47 100644 --- a/modules/bioinspired/src/transientareassegmentationmodule.cpp +++ b/modules/bioinspired/src/transientareassegmentationmodule.cpp @@ -142,7 +142,7 @@ class TransientAreasSegmentationModuleImpl : protected BasicRetinaFilter * parameters setup display method * @return a string which contains formatted parameters information */ - const String printSetup(); + String printSetup(); /** * write xml/yml formated parameters information @@ -232,7 +232,7 @@ class TransientAreasSegmentationModuleImpl_: public TransientAreasSegmentationM inline virtual void setup(String segmentationParameterFile, const bool applyDefaultSetupOnFailure) CV_OVERRIDE { _segmTool.setup(segmentationParameterFile, applyDefaultSetupOnFailure); } inline virtual void setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailure) CV_OVERRIDE { _segmTool.setup(fs, applyDefaultSetupOnFailure); } inline virtual void setup(SegmentationParameters newParameters) CV_OVERRIDE { _segmTool.setup(newParameters); } - inline virtual const String printSetup() CV_OVERRIDE { return _segmTool.printSetup(); } + inline virtual String printSetup() CV_OVERRIDE { return _segmTool.printSetup(); } inline virtual struct SegmentationParameters getParameters() CV_OVERRIDE { return _segmTool.getParameters(); } inline virtual void write( String fs ) const CV_OVERRIDE { _segmTool.write(fs); } inline virtual void run(InputArray inputToSegment, const int channelIndex) CV_OVERRIDE { _segmTool.run(inputToSegment, channelIndex); } @@ -368,7 +368,7 @@ void TransientAreasSegmentationModuleImpl::setup(cv::bioinspired::SegmentationPa } -const String TransientAreasSegmentationModuleImpl::printSetup() +String TransientAreasSegmentationModuleImpl::printSetup() { std::stringstream outmessage; diff --git a/modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp b/modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp index 68b23124c2..3aac859284 100644 --- a/modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp +++ b/modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp @@ -255,7 +255,7 @@ class CV_EXPORTS_W ColoredKinFu CV_WRAP virtual void reset() = 0; /** @brief Get current pose in voxel space */ - virtual const Affine3f getPose() const = 0; + virtual Affine3f getPose() const = 0; /** @brief Process next depth frame @param depth input Mat of depth frame diff --git a/modules/rgbd/include/opencv2/rgbd/dynafu.hpp b/modules/rgbd/include/opencv2/rgbd/dynafu.hpp index 55fe36d7e1..32875ad5ac 100644 --- a/modules/rgbd/include/opencv2/rgbd/dynafu.hpp +++ b/modules/rgbd/include/opencv2/rgbd/dynafu.hpp @@ -95,7 +95,7 @@ class CV_EXPORTS_W DynaFu CV_WRAP virtual void reset() = 0; /** @brief Get current pose in voxel space */ - virtual const Affine3f getPose() const = 0; + virtual Affine3f getPose() const = 0; /** @brief Process next depth frame diff --git a/modules/rgbd/include/opencv2/rgbd/kinfu.hpp b/modules/rgbd/include/opencv2/rgbd/kinfu.hpp index ebc15f9bb8..696b726558 100644 --- a/modules/rgbd/include/opencv2/rgbd/kinfu.hpp +++ b/modules/rgbd/include/opencv2/rgbd/kinfu.hpp @@ -251,7 +251,7 @@ class CV_EXPORTS_W KinFu CV_WRAP virtual void reset() = 0; /** @brief Get current pose in voxel space */ - virtual const Affine3f getPose() const = 0; + virtual Affine3f getPose() const = 0; /** @brief Process next depth frame diff --git a/modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp b/modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp index a7a0b7adc8..31839cfca9 100644 --- a/modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp +++ b/modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp @@ -136,7 +136,7 @@ class CV_EXPORTS_W LargeKinfu CV_WRAP virtual void reset() = 0; - virtual const Affine3f getPose() const = 0; + virtual Affine3f getPose() const = 0; CV_WRAP virtual bool update(InputArray depth) = 0; }; diff --git a/modules/rgbd/src/colored_kinfu.cpp b/modules/rgbd/src/colored_kinfu.cpp index 0aaa58cc79..449acd3ccf 100644 --- a/modules/rgbd/src/colored_kinfu.cpp +++ b/modules/rgbd/src/colored_kinfu.cpp @@ -150,7 +150,7 @@ class ColoredKinFuImpl : public ColoredKinFu void reset() CV_OVERRIDE; - const Affine3f getPose() const CV_OVERRIDE; + Affine3f getPose() const CV_OVERRIDE; bool update(InputArray depth, InputArray rgb) CV_OVERRIDE; @@ -200,7 +200,7 @@ const Params& ColoredKinFuImpl::getParams() const } template< typename MatType > -const Affine3f ColoredKinFuImpl::getPose() const +Affine3f ColoredKinFuImpl::getPose() const { return pose; } diff --git a/modules/rgbd/src/dynafu.cpp b/modules/rgbd/src/dynafu.cpp index 002be7bd6d..3cef71f3e0 100644 --- a/modules/rgbd/src/dynafu.cpp +++ b/modules/rgbd/src/dynafu.cpp @@ -100,7 +100,7 @@ class DynaFuImpl : public DynaFu void reset() CV_OVERRIDE; - const Affine3f getPose() const CV_OVERRIDE; + Affine3f getPose() const CV_OVERRIDE; bool update(InputArray depth) CV_OVERRIDE; @@ -257,7 +257,7 @@ const Params& DynaFuImpl::getParams() const } template< typename T > -const Affine3f DynaFuImpl::getPose() const +Affine3f DynaFuImpl::getPose() const { return pose; } diff --git a/modules/rgbd/src/kinfu.cpp b/modules/rgbd/src/kinfu.cpp index 4ba73aabc7..14dbdc7aef 100644 --- a/modules/rgbd/src/kinfu.cpp +++ b/modules/rgbd/src/kinfu.cpp @@ -138,7 +138,7 @@ class KinFuImpl : public KinFu void reset() CV_OVERRIDE; - const Affine3f getPose() const CV_OVERRIDE; + Affine3f getPose() const CV_OVERRIDE; bool update(InputArray depth) CV_OVERRIDE; @@ -187,7 +187,7 @@ const Params& KinFuImpl::getParams() const } template< typename MatType > -const Affine3f KinFuImpl::getPose() const +Affine3f KinFuImpl::getPose() const { return pose; } diff --git a/modules/rgbd/src/large_kinfu.cpp b/modules/rgbd/src/large_kinfu.cpp index aae042cb0a..4fe7635434 100644 --- a/modules/rgbd/src/large_kinfu.cpp +++ b/modules/rgbd/src/large_kinfu.cpp @@ -121,7 +121,7 @@ class LargeKinfuImpl : public LargeKinfu void reset() CV_OVERRIDE; - const Affine3f getPose() const CV_OVERRIDE; + Affine3f getPose() const CV_OVERRIDE; bool update(InputArray depth) CV_OVERRIDE; @@ -170,7 +170,7 @@ const Params& LargeKinfuImpl::getParams() const } template -const Affine3f LargeKinfuImpl::getPose() const +Affine3f LargeKinfuImpl::getPose() const { return pose; } diff --git a/modules/xfeatures2d/src/msd_pyramid.hpp b/modules/xfeatures2d/src/msd_pyramid.hpp index 9fc3243a32..9b1d9037f1 100644 --- a/modules/xfeatures2d/src/msd_pyramid.hpp +++ b/modules/xfeatures2d/src/msd_pyramid.hpp @@ -60,7 +60,7 @@ class MSDImagePyramid } ~MSDImagePyramid() {}; - const std::vector getImPyr() const + std::vector getImPyr() const { return m_imPyr; };