From b70b5a30118966508958fd20df69c447601d3938 Mon Sep 17 00:00:00 2001 From: alexandre benoit Date: Tue, 30 Apr 2013 13:13:50 +0200 Subject: [PATCH] corrections required for portability. To be validated by buildbot --- modules/contrib/include/opencv2/contrib/retina.hpp | 4 ++-- modules/contrib/src/retina.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/contrib/include/opencv2/contrib/retina.hpp b/modules/contrib/include/opencv2/contrib/retina.hpp index 75d4effc96..cebe72c429 100644 --- a/modules/contrib/include/opencv2/contrib/retina.hpp +++ b/modules/contrib/include/opencv2/contrib/retina.hpp @@ -294,8 +294,8 @@ public: */ virtual void activateContoursProcessing(const bool activate)=0; }; -Ptr createRetina(Size inputSize); -Ptr 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 createRetina(Size inputSize); +CV_EXPORTS Ptr 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__ */ diff --git a/modules/contrib/src/retina.cpp b/modules/contrib/src/retina.cpp index b0af7d75ee..e9d4de6693 100644 --- a/modules/contrib/src/retina.cpp +++ b/modules/contrib/src/retina.cpp @@ -565,7 +565,7 @@ void RetinaImpl::getParvoRAW(cv::Mat &parvoOutputBufferCopy){ const Mat RetinaImpl::getMagnoRAW() const { // create a cv::Mat header for the valarray //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 { // 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 // 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