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

corrections required for portability. To be validated by buildbot

Browse Source
This commit is contained in:
alexandre benoit 2013-04-30 13:13:50 +02:00
parent 1976b3d9b6
commit b70b5a3011
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/contrib/include/opencv2/contrib/retina.hpp
View File

@ -294,8 +294,8 @@ public:
*/ */
virtual void activateContoursProcessing(const bool activate)=0; virtual void activateContoursProcessing(const bool activate)=0;
}; };
Ptr<Retina> createRetina(Size inputSize); CV_EXPORTS Ptr<Retina> createRetina(Size inputSize);
Ptr<Retina> createRetina(Size inputSize, const bool colorMode, RETINA_COLORSAMPLINGMETHOD colorSamplingMethod=RETINA_COLOR_BAYER, const bool useRetinaLogSampling=false, const double reductionFactor=1.0, const double samplingStrenght=10.0); CV_EXPORTS Ptr<Retina> createRetina(Size inputSize, const bool colorMode, RETINA_COLORSAMPLINGMETHOD colorSamplingMethod=RETINA_COLOR_BAYER, const bool useRetinaLogSampling=false, const double reductionFactor=1.0, const double samplingStrenght=10.0);
} }
#endif /* __OPENCV_CONTRIB_RETINA_HPP__ */ #endif /* __OPENCV_CONTRIB_RETINA_HPP__ */

6
modules/contrib/src/retina.cpp
View File

@ -565,7 +565,7 @@ void RetinaImpl::getParvoRAW(cv::Mat &parvoOutputBufferCopy){
const Mat RetinaImpl::getMagnoRAW() const { const Mat RetinaImpl::getMagnoRAW() const {
// create a cv::Mat header for the valarray // create a cv::Mat header for the valarray
//const cv::Mat output= //const cv::Mat output=
return Mat(_retinaFilter->getMovingContours().size(),1, CV_32F, (void*)&_retinaFilter->getMovingContours()[0]); return Mat(_retinaFilter->getMovingContours().size(),1, CV_32F, (void*)(&_retinaFilter->getMovingContours()[0]));
} }
@ -573,11 +573,11 @@ const Mat RetinaImpl::getParvoRAW() const {
if (_retinaFilter->getColorMode()) // check if color mode is enabled if (_retinaFilter->getColorMode()) // check if color mode is enabled
{ {
// create a cv::Mat table (for RGB planes as a single vector) // create a cv::Mat table (for RGB planes as a single vector)
return Mat(_retinaFilter->getColorOutput().size(), 1, CV_32F, (void*)&_retinaFilter->getColorOutput()[0]); return Mat(_retinaFilter->getColorOutput().size(), 1, CV_32F, (void*)&(_retinaFilter->getColorOutput()[0]));
} }
// otherwise, output is gray level // otherwise, output is gray level
// create a cv::Mat header for the valarray // create a cv::Mat header for the valarray
return Mat( _retinaFilter->getContours().size(), 1, CV_32F, (void*)&_retinaFilter->getContours()[0]); return Mat( _retinaFilter->getContours().size(), 1, CV_32F, (void*)&(_retinaFilter->getContours()[0]));
} }
// private method called by constructirs // private method called by constructirs