Skip to content

remove const from functions returning by value #3266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2022
Merged

remove const from functions returning by value #3266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/bioinspired/include/opencv2/bioinspired/retina.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion modules/bioinspired/include/opencv2/bioinspired/transientareassegmentationmodule.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions modules/bioinspired/src/retina.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -445,7 +445,7 @@ void RetinaImpl::setup(RetinaParameters newConfiguration)

}

const String RetinaImpl::printSetup()
String RetinaImpl::printSetup()
{
std::stringstream outmessage;

Expand Down Expand Up @@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions modules/bioinspired/src/retina_ocl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 ///////////
Expand Down
6 changes: 3 additions & 3 deletions modules/bioinspired/src/retina_ocl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions modules/bioinspired/src/transientareassegmentationmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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); }
Expand Down Expand Up @@ -368,7 +368,7 @@ void TransientAreasSegmentationModuleImpl::setup(cv::bioinspired::SegmentationPa

}

const String TransientAreasSegmentationModuleImpl::printSetup()
String TransientAreasSegmentationModuleImpl::printSetup()
{
std::stringstream outmessage;

Expand Down
2 changes: 1 addition & 1 deletion modules/rgbd/include/opencv2/rgbd/colored_kinfu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/rgbd/include/opencv2/rgbd/dynafu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion modules/rgbd/include/opencv2/rgbd/kinfu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion modules/rgbd/include/opencv2/rgbd/large_kinfu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
4 changes: 2 additions & 2 deletions modules/rgbd/src/colored_kinfu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -200,7 +200,7 @@ const Params& ColoredKinFuImpl<MatType>::getParams() const
}

template< typename MatType >
const Affine3f ColoredKinFuImpl<MatType>::getPose() const
Affine3f ColoredKinFuImpl<MatType>::getPose() const
{
return pose;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/rgbd/src/dynafu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -257,7 +257,7 @@ const Params& DynaFuImpl<T>::getParams() const
}

template< typename T >
const Affine3f DynaFuImpl<T>::getPose() const
Affine3f DynaFuImpl<T>::getPose() const
{
return pose;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/rgbd/src/kinfu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -187,7 +187,7 @@ const Params& KinFuImpl<MatType>::getParams() const
}

template< typename MatType >
const Affine3f KinFuImpl<MatType>::getPose() const
Affine3f KinFuImpl<MatType>::getPose() const
{
return pose;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/rgbd/src/large_kinfu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -170,7 +170,7 @@ const Params& LargeKinfuImpl<MatType>::getParams() const
}

template<typename MatType>
const Affine3f LargeKinfuImpl<MatType>::getPose() const
Affine3f LargeKinfuImpl<MatType>::getPose() const
{
return pose;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/xfeatures2d/src/msd_pyramid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class MSDImagePyramid
}
~MSDImagePyramid() {};

const std::vector<cv::Mat> getImPyr() const
std::vector<cv::Mat> getImPyr() const
{
return m_imPyr;
};
Expand Down