From ec6ab8cdd5d57de3f924c760cded7cbd04a83197 Mon Sep 17 00:00:00 2001 From: Vladislav Sovrasov Date: Thu, 10 Aug 2017 14:24:31 +0300 Subject: [PATCH] bioinspired: remove register specifier to prevent possible warnings from cxx11 compilers --- modules/bioinspired/src/basicretinafilter.cpp | 100 +++++++++--------- modules/bioinspired/src/basicretinafilter.hpp | 32 +++--- .../bioinspired/src/imagelogpolprojection.cpp | 4 +- modules/bioinspired/src/magnoretinafilter.cpp | 20 ++-- modules/bioinspired/src/magnoretinafilter.hpp | 12 +-- modules/bioinspired/src/parvoretinafilter.cpp | 10 +- modules/bioinspired/src/retinacolor.cpp | 36 +++---- modules/bioinspired/src/retinacolor.hpp | 14 +-- modules/bioinspired/src/retinafilter.cpp | 20 ++-- modules/bioinspired/src/templatebuffer.hpp | 26 ++--- .../src/transientareassegmentationmodule.cpp | 2 +- 11 files changed, 138 insertions(+), 138 deletions(-) diff --git a/modules/bioinspired/src/basicretinafilter.cpp b/modules/bioinspired/src/basicretinafilter.cpp index 7e7b467fa..4f1a34c18 100644 --- a/modules/bioinspired/src/basicretinafilter.cpp +++ b/modules/bioinspired/src/basicretinafilter.cpp @@ -326,7 +326,7 @@ void BasicRetinaFilter::_localLuminanceAdaptation(float *inputOutputFrame, const /* const float *localLuminancePTR=localLuminance; float *inputOutputFramePTR=inputOutputFrame; - for (register unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputOutputFramePTR) + for (unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputOutputFramePTR) { float X0=*(localLuminancePTR++)*_localLuminanceFactor+_localLuminanceAddon; *(inputOutputFramePTR) = (_maxInputValue+X0)**inputOutputFramePTR/(*inputOutputFramePTR +X0+0.00000000001); @@ -353,7 +353,7 @@ void BasicRetinaFilter::_localLuminanceAdaptation(const float *inputFrame, const const float *localLuminancePTR=localLuminance; const float *inputFramePTR=inputFrame; float *outputFramePTR=outputFrame; - for (register unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputFramePTR, ++outputFramePTR) + for (unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputFramePTR, ++outputFramePTR) { float X0=*(localLuminancePTR++)*_localLuminanceFactor+_localLuminanceAddon; // TODO : the following line can lead to a divide by zero ! A small offset is added, take care if the offset is too large in case of High Dynamic Range images which can use very small values... @@ -370,7 +370,7 @@ void BasicRetinaFilter::_localLuminanceAdaptationPosNegValues(const float *input const float *inputFramePTR=inputFrame; float *outputFramePTR=outputFrame; float factor=_maxInputValue*2.0f/(float)CV_PI; - for (register unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputFramePTR) + for (unsigned int IDpixel=0 ; IDpixel<_filterOutput.getNBpixels() ; ++IDpixel, ++inputFramePTR) { float X0=*(localLuminancePTR++)*_localLuminanceFactor+_localLuminanceAddon; *(outputFramePTR++) = factor*atan(*inputFramePTR/X0);//(_maxInputValue+X0)**inputFramePTR/(*inputFramePTR +X0); @@ -455,8 +455,8 @@ void BasicRetinaFilter::_horizontalCausalFilter(float *outputFrame, unsigned int //#pragma omp parallel for for (unsigned int IDrow=IDrowStart; IDrow squaring horizontal causal filter void BasicRetinaFilter::_squaringHorizontalCausalFilter(const float *inputFrame, float *outputFrame, unsigned int IDrowStart, unsigned int IDrowEnd) { - register float* outputPTR=outputFrame+IDrowStart*_filterOutput.getNBcolumns(); - register const float* inputPTR=inputFrame+IDrowStart*_filterOutput.getNBcolumns(); + float* outputPTR=outputFrame+IDrowStart*_filterOutput.getNBcolumns(); + const float* inputPTR=inputFrame+IDrowStart*_filterOutput.getNBcolumns(); for (unsigned int IDrow=IDrowStart; IDrow &ImageLogPolProjection::runProjection(const std::valarray &ImageLogPolProjection::runProjection(const std::valarraygetNBpixels(); ++IDpixel) { @@ -200,10 +200,10 @@ const std::valarray &MagnoRetinaFilter::runFilter(const std::valarray &ParvoRetinaFilter::runFilter(const std::valarray &multiplexed // -> first set demultiplexed frame to 0 _demultiplexedTempBuffer=0; // -> demultiplex process - register unsigned int *colorSamplingPRT=&_colorSampling[0]; - register const float *multiplexedColorFramePtr=get_data(multiplexedColorFrame); + unsigned int *colorSamplingPRT=&_colorSampling[0]; + const float *multiplexedColorFramePtr=get_data(multiplexedColorFrame); for (unsigned int indexa=0; indexa<_filterOutput.getNBpixels() ; ++indexa) _demultiplexedTempBuffer[*(colorSamplingPRT++)]=*(multiplexedColorFramePtr++); @@ -280,9 +280,9 @@ void RetinaColor::runColorDemultiplexing(const std::valarray &multiplexed }*/ // normalize by the photoreceptors local density and retrieve the local luminance - register float *chrominancePTR= &_chrominance[0]; - register float *colorLocalDensityPTR= &_colorLocalDensity[0]; - register float *luminance= &(*_luminance)[0]; + float *chrominancePTR= &_chrominance[0]; + float *colorLocalDensityPTR= &_colorLocalDensity[0]; + float *luminance= &(*_luminance)[0]; if (!adaptiveFiltering)// compute the gradient on the luminance { if (_samplingMethod==RETINA_COLOR_RANDOM) @@ -326,7 +326,7 @@ void RetinaColor::runColorDemultiplexing(const std::valarray &multiplexed }else { - register const float *multiplexedColorFramePTR= get_data(multiplexedColorFrame); + const float *multiplexedColorFramePTR= get_data(multiplexedColorFrame); for (unsigned int indexc=0; indexc<_filterOutput.getNBpixels() ; ++indexc, ++chrominancePTR, ++colorLocalDensityPTR, ++luminance, ++multiplexedColorFramePTR) { // normalize by photoreceptors density @@ -412,8 +412,8 @@ void RetinaColor::runColorDemultiplexing(const std::valarray &multiplexed void RetinaColor::runColorMultiplexing(const std::valarray &demultiplexedInputFrame, std::valarray &multiplexedFrame) { // multiply each color layer by its bayer mask - register unsigned int *colorSamplingPTR= &_colorSampling[0]; - register float *multiplexedFramePTR= &multiplexedFrame[0]; + unsigned int *colorSamplingPTR= &_colorSampling[0]; + float *multiplexedFramePTR= &multiplexedFrame[0]; for (unsigned int indexp=0; indexp<_filterOutput.getNBpixels(); ++indexp) *(multiplexedFramePTR++)=demultiplexedInputFrame[*(colorSamplingPTR++)]; } @@ -440,8 +440,8 @@ void RetinaColor::clipRGBOutput_0_maxInputValue(float *inputOutputBuffer, const #ifdef MAKE_PARALLEL // call the TemplateBuffer TBB clipping method cv::parallel_for_(cv::Range(0,_filterOutput.getNBpixels()*3), Parallel_clipBufferValues(inputOutputBuffer, 0, maxInputValue)); #else - register float *inputOutputBufferPTR=inputOutputBuffer; - for (register unsigned int jf = 0; jf < _filterOutput.getNBpixels()*3; ++jf, ++inputOutputBufferPTR) + float *inputOutputBufferPTR=inputOutputBuffer; + for (unsigned int jf = 0; jf < _filterOutput.getNBpixels()*3; ++jf, ++inputOutputBufferPTR) { if (*inputOutputBufferPTR>maxInputValue) *inputOutputBufferPTR=maxInputValue; @@ -587,12 +587,12 @@ void RetinaColor::_adaptiveHorizontalCausalFilter_addInput(const float *inputFra #ifdef MAKE_PARALLEL cv::parallel_for_(cv::Range(IDrowStart,IDrowEnd), Parallel_adaptiveHorizontalCausalFilter_addInput(inputFrame, outputFrame, &_imageGradient[0], _filterOutput.getNBcolumns())); #else - register float* outputPTR=outputFrame+IDrowStart*_filterOutput.getNBcolumns(); - register const float* inputPTR=inputFrame+IDrowStart*_filterOutput.getNBcolumns(); - register const float *imageGradientPTR= &_imageGradient[0]+IDrowStart*_filterOutput.getNBcolumns(); + float* outputPTR=outputFrame+IDrowStart*_filterOutput.getNBcolumns(); + const float* inputPTR=inputFrame+IDrowStart*_filterOutput.getNBcolumns(); + const float *imageGradientPTR= &_imageGradient[0]+IDrowStart*_filterOutput.getNBcolumns(); for (unsigned int IDrow=IDrowStart; IDrowmaxValue) *inputOutputBufferPTR=maxValue; @@ -430,8 +430,8 @@ public: type maxValue=inputOutputBuffer[0], minValue=inputOutputBuffer[0]; // get the min and max value - register type *inputOutputBufferPTR=inputOutputBuffer; - for (register size_t j = 0; j &inpu float*localMotionPTR=&_localMotion[0], *neighborhoodMotionPTR=&_neighborhoodMotion[0], *contextMotionPTR=&_contextMotionEnergy[0]; // float meanEnergy=LPfilter2.sum()/(float)_LPfilter2.size(); - register bool *segmentationPicturePTR= &_segmentedAreas[0]; + bool *segmentationPicturePTR= &_segmentedAreas[0]; for (unsigned int index=0; index<_filterOutput.getNBpixels() ; ++index, ++segmentationPicturePTR, ++localMotionPTR, ++neighborhoodMotionPTR, contextMotionPTR++) { float generalMotionContextDecision=*neighborhoodMotionPTR-*contextMotionPTR;