Skip to content

Commit cfa540e

Browse files
authored
Merge pull request #3522 from asmorkalov:as/gcc_11_warning_fix
Wstringop-overflow warning fix in bio inspired module
2 parents f10c84d + e963ec2 commit cfa540e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/bioinspired/src/transientareassegmentationmodule.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class TransientAreasSegmentationModuleImpl : protected BasicRetinaFilter
136136
/**
137137
* @return the current parameters setup
138138
*/
139-
struct SegmentationParameters getParameters();
139+
SegmentationParameters getParameters();
140140

141141
/**
142142
* parameters setup display method
@@ -202,7 +202,7 @@ class TransientAreasSegmentationModuleImpl : protected BasicRetinaFilter
202202
*/
203203
inline const std::valarray<float> &getMotionContextPicture() const {return _contextMotionEnergy;}
204204

205-
struct cv::bioinspired::SegmentationParameters _segmentationParameters;
205+
cv::bioinspired::SegmentationParameters _segmentationParameters;
206206
// template buffers and related acess pointers
207207
std::valarray<float> _inputToSegment;
208208
std::valarray<float> _contextMotionEnergy;
@@ -233,7 +233,7 @@ class TransientAreasSegmentationModuleImpl_: public TransientAreasSegmentationM
233233
inline virtual void setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailure) CV_OVERRIDE { _segmTool.setup(fs, applyDefaultSetupOnFailure); }
234234
inline virtual void setup(SegmentationParameters newParameters) CV_OVERRIDE { _segmTool.setup(newParameters); }
235235
inline virtual String printSetup() CV_OVERRIDE { return _segmTool.printSetup(); }
236-
inline virtual struct SegmentationParameters getParameters() CV_OVERRIDE { return _segmTool.getParameters(); }
236+
inline virtual SegmentationParameters getParameters() CV_OVERRIDE { return _segmTool.getParameters(); }
237237
inline virtual void write( String fs ) const CV_OVERRIDE { _segmTool.write(fs); }
238238
inline virtual void run(InputArray inputToSegment, const int channelIndex) CV_OVERRIDE { _segmTool.run(inputToSegment, channelIndex); }
239239
inline virtual void getSegmentationPicture(OutputArray transientAreas) CV_OVERRIDE { return _segmTool.getSegmentationPicture(transientAreas); }
@@ -285,7 +285,7 @@ void TransientAreasSegmentationModuleImpl::clearAllBuffers()
285285
_segmentedAreas=0;
286286
}
287287

288-
struct SegmentationParameters TransientAreasSegmentationModuleImpl::getParameters()
288+
SegmentationParameters TransientAreasSegmentationModuleImpl::getParameters()
289289
{
290290
return _segmentationParameters;
291291
}
@@ -343,7 +343,7 @@ void TransientAreasSegmentationModuleImpl::setup(cv::FileStorage &fs, const bool
343343
std::cout<<"Retina::setup: resetting retina with default parameters"<<std::endl;
344344
if (applyDefaultSetupOnFailure)
345345
{
346-
struct cv::bioinspired::SegmentationParameters defaults;
346+
cv::bioinspired::SegmentationParameters defaults;
347347
setup(defaults);
348348
}
349349
std::cout<<"SegmentationModule::setup: wrong/unappropriate xml parameter file : error report :`n=>"<<e.what()<<std::endl;
@@ -356,7 +356,7 @@ void TransientAreasSegmentationModuleImpl::setup(cv::bioinspired::SegmentationPa
356356
{
357357

358358
// copy structure contents
359-
memcpy(&_segmentationParameters, &newParameters, sizeof(cv::bioinspired::SegmentationParameters));
359+
_segmentationParameters = newParameters;
360360
// apply setup
361361
// init local motion energy extraction low pass filter
362362
BasicRetinaFilter::setLPfilterParameters(0, newParameters.localEnergy_temporalConstant, newParameters.localEnergy_spatialConstant);

0 commit comments

Comments
 (0)