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

minor error correction

Browse Source
This commit is contained in:
alexandre benoit 2013-04-30 14:52:14 +02:00
parent 80e65e08b5
commit a659e287fb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,8 +564,8 @@ void RetinaImpl::getParvoRAW(cv::Mat &parvoOutputBufferCopy){
// original API level data accessors : get buffers addresses... // original API level data accessors : get buffers addresses...
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 float *retinaMagnoFilterOutputPTR=&(_retinaFilter->getMovingContours()[0]);
return Mat(_retinaFilter->getMovingContours().size(),1, CV_32F, (void*)(&_retinaFilter->getMovingContours()[0])); return Mat(_retinaFilter->getMovingContours().size(),1, CV_32F, (void*)retinaMagnoFilterOutputPTR);
} }
@ -573,13 +573,13 @@ 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)
const float *retinaFilterOutputPTR=&(_retinaFilter->getColorOutput()[0]); const float *retinaParvoFilterOutputPTR=&(_retinaFilter->getColorOutput()[0]);
return Mat(_retinaFilter->getColorOutput().size(), 1, CV_32F, (void*)retinaFilterOutputPTR); return Mat(_retinaFilter->getColorOutput().size(), 1, CV_32F, (void*)retinaParvoFilterOutputPTR);
} }
// 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
const float *retinaFilterOutputPTR=&(_retinaFilter->getContours()[0]); const float *retinaParvoFilterOutputPTR=&(_retinaFilter->getContours()[0]);
return Mat( _retinaFilter->getContours().size(), 1, CV_32F, (void*)retinaFilterOutputPTR); return Mat( _retinaFilter->getContours().size(), 1, CV_32F, (void*)retinaParvoFilterOutputPTR);
} }
// private method called by constructirs // private method called by constructirs

2
samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
View File

@ -39,7 +39,7 @@ int main(int argc, char* argv[]) {
// welcome message // welcome message
std::cout<<"****************************************************"<<std::endl; std::cout<<"****************************************************"<<std::endl;
std::cout<<"* Retina demonstration : demonstrates the use of is a wrapper class of the Gipsa/Listic Labs retina model."<<std::endl; std::cout<<"* Retina demonstration : demonstrates the use of is a wrapper class of the Gipsa/Listic Labs retina model."<<std::endl;
std::cout<<"* This demo will try to load the file 'RetinaSpecificParameters.xml' (if exists).\nTo create it, copy the autogenerated template 'RetinaDefaultParameters.xml'.\nThen twaek it with your own retina parameters."<<std::endl; std::cout<<"* This demo will try to load the file 'RetinaSpecificParameters.xml' (if exists).\nTo create it, copy the autogenerated template 'RetinaDefaultParameters.xml'.\nThen tweak it with your own retina parameters."<<std::endl;
// basic input arguments checking // basic input arguments checking
if (argc<2) if (argc<2)
{ {