generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor correction after buildbot warnings

Browse Source
This commit is contained in:
alexandre benoit
2013-06-13 06:55:35 +02:00
parent 7bff79bbeb
commit 2c1fb5fd71
19 changed files with 19 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bioinspired/src/basicretinafilter.hpp
View File

@@ -655,5 +655,3 @@ namespace hvstools
}// end of namespace hvstools
}// end of namespace cv
#endif

2
modules/bioinspired/src/magnoretinafilter.cpp
View File

@@ -210,5 +210,3 @@ const std::valarray<float> &MagnoRetinaFilter::runFilter(const std::valarray<flo
}
}// end of namespace hvstools
}// end of namespace cv

2
modules/bioinspired/src/magnoretinafilter.hpp
View File

@@ -243,5 +243,3 @@ namespace hvstools
}// end of namespace cv
#endif /*MagnoRetinaFilter_H_*/

1
modules/bioinspired/src/parvoretinafilter.cpp
View File

@@ -231,4 +231,3 @@ void ParvoRetinaFilter::_OPL_OnOffWaysComputing() // WARNING : this method requi
}
}// end of namespace hvstools
}// end of namespace cv

1
modules/bioinspired/src/parvoretinafilter.hpp
View File

@@ -261,4 +261,3 @@ private:
}// end of namespace hvstools
}// end of namespace cv
#endif

8
modules/bioinspired/src/retina.cpp
View File

@@ -528,13 +528,13 @@ void RetinaImpl::applyFastToneMapping(InputArray inputImage, OutputArray outputT
// process tone mapping
if (colorMode)
{
std::valarray<float> imageOutput(nbPixels*3);
std::valarray<float> imageOutput(nbPixels*3);
_retinaFilter->runRGBToneMapping(_inputBuffer, imageOutput, true, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity);
_convertValarrayBuffer2cvMat(imageOutput, _retinaFilter->getOutputNBrows(), _retinaFilter->getOutputNBcolumns(), true, outputToneMappedImage);
}else
{
std::valarray<float> imageOutput(nbPixels);
_retinaFilter->runGrayToneMapping(_inputBuffer, imageOutput, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity);
std::valarray<float> imageOutput(nbPixels);
_retinaFilter->runGrayToneMapping(_inputBuffer, imageOutput, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity);
_convertValarrayBuffer2cvMat(imageOutput, _retinaFilter->getOutputNBrows(), _retinaFilter->getOutputNBcolumns(), false, outputToneMappedImage);
}
@@ -671,7 +671,6 @@ bool _convertCvMat2ValarrayBuffer(InputArray inputMat, std::valarray<float> &out
typedef float T; // define here the target pixel format, here, float
const int dsttype = DataType<T>::depth; // output buffer is float format
const unsigned int nbPixels=inputMat.getMat().rows*inputMat.getMat().cols;
const unsigned int doubleNBpixels=inputMat.getMat().rows*inputMat.getMat().cols*2;
@@ -720,4 +719,3 @@ void RetinaImpl::activateContoursProcessing(const bool activate){_retinaFilter->
}// end of namespace hvstools
}// end of namespace cv

2
modules/bioinspired/src/retinacolor.hpp
View File

@@ -387,5 +387,3 @@ namespace hvstools
}// end of namespace cv
#endif /*RETINACOLOR_HPP_*/

14
modules/bioinspired/src/retinafasttonemapping.cpp
View File

@@ -111,7 +111,7 @@ public:
// resize buffers
_inputBuffer.resize(nbPixels*3); // buffer supports gray images but also 3 channels color buffers... (larger is better...)
_imageOutput.resize(nbPixels*3);
_imageOutput.resize(nbPixels*3);
_temp2.resize(nbPixels);
// allocate the main filter with 2 setup sets properties (one for each low pass filter
_multiuseFilter = new BasicRetinaFilter(imageInput.height, imageInput.width, 2);
@@ -144,7 +144,7 @@ public:
_convertValarrayBuffer2cvMat(_imageOutput, _multiuseFilter->getNBrows(), _multiuseFilter->getNBcolumns(), true, outputToneMappedImage);
}else
{
_runGrayToneMapping(_inputBuffer, _imageOutput);
_runGrayToneMapping(_inputBuffer, _imageOutput);
_convertValarrayBuffer2cvMat(_imageOutput, _multiuseFilter->getNBrows(), _multiuseFilter->getNBcolumns(), false, outputToneMappedImage);
}
@@ -152,17 +152,17 @@ public:
/**
* setup method that updates tone mapping behaviors by adjusing the local luminance computation area
* @param photoreceptorsNeighborhoodRadius the first stage local adaptation area
* @param photoreceptorsNeighborhoodRadius the first stage local adaptation area
* @param ganglioncellsNeighborhoodRadius the second stage local adaptation area
* @param meanLuminanceModulatorK the factor applied to modulate the meanLuminance information (default is 1, see reference paper)
*/
virtual void setup(const float photoreceptorsNeighborhoodRadius=3.f, const float ganglioncellsNeighborhoodRadius=1.f, const float meanLuminanceModulatorK=1.f)
{
// setup the spatio-temporal properties of each filter
_meanLuminanceModulatorK = meanLuminanceModulatorK;
_meanLuminanceModulatorK = meanLuminanceModulatorK;
_multiuseFilter->setV0CompressionParameter(1.f, 255.f, 128.f);
_multiuseFilter->setLPfilterParameters(0.f, 0.f, photoreceptorsNeighborhoodRadius, 1);
_multiuseFilter->setLPfilterParameters(0.f, 0.f, ganglioncellsNeighborhoodRadius, 2);
_multiuseFilter->setLPfilterParameters(0.f, 0.f, photoreceptorsNeighborhoodRadius, 1);
_multiuseFilter->setLPfilterParameters(0.f, 0.f, ganglioncellsNeighborhoodRadius, 2);
}
private:
@@ -171,7 +171,7 @@ private:
cv::Ptr <RetinaColor> _colorEngine;
//!< buffer used to convert input cv::Mat to internal retina buffers format (valarrays)
std::valarray<float> _inputBuffer;
std::valarray<float> _inputBuffer;
std::valarray<float> _imageOutput;
std::valarray<float> _temp2;
float _meanLuminanceModulatorK;

3
modules/bioinspired/src/templatebuffer.hpp
View File

@@ -553,6 +553,3 @@ public:
}// end of namespace hvstools
}// end of namespace cv
#endif