From 711fb6bd92efbe80e34e5bad6aec1240e5eb1dd1 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Tue, 13 Aug 2013 16:48:54 +0400 Subject: [PATCH] Boring changes - bioinspired. --- modules/bioinspired/src/retina.cpp | 6 ++++-- modules/bioinspired/src/retina_ocl.cpp | 4 ++-- modules/bioinspired/src/retinafasttonemapping.cpp | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/bioinspired/src/retina.cpp b/modules/bioinspired/src/retina.cpp index 75e4b841f..460433107 100644 --- a/modules/bioinspired/src/retina.cpp +++ b/modules/bioinspired/src/retina.cpp @@ -295,8 +295,10 @@ private: }; // smart pointers allocation : -Ptr createRetina(Size inputSize){ return new RetinaImpl(inputSize); } -Ptr createRetina(Size inputSize, const bool colorMode, int colorSamplingMethod, const bool useRetinaLogSampling, const double reductionFactor, const double samplingStrenght){return new RetinaImpl(inputSize, colorMode, colorSamplingMethod, useRetinaLogSampling, reductionFactor, samplingStrenght);} +Ptr createRetina(Size inputSize){ return makePtr(inputSize); } +Ptr createRetina(Size inputSize, const bool colorMode, int colorSamplingMethod, const bool useRetinaLogSampling, const double reductionFactor, const double samplingStrenght){ + return makePtr(inputSize, colorMode, colorSamplingMethod, useRetinaLogSampling, reductionFactor, samplingStrenght); +} // RetinaImpl code diff --git a/modules/bioinspired/src/retina_ocl.cpp b/modules/bioinspired/src/retina_ocl.cpp index ca94bc8fb..41169561f 100644 --- a/modules/bioinspired/src/retina_ocl.cpp +++ b/modules/bioinspired/src/retina_ocl.cpp @@ -1639,10 +1639,10 @@ void RetinaFilter::_processRetinaParvoMagnoMapping() } } /* namespace ocl */ -Ptr createRetina_OCL(Size getInputSize){ return new ocl::RetinaOCLImpl(getInputSize); } +Ptr createRetina_OCL(Size getInputSize){ return makePtr(getInputSize); } Ptr createRetina_OCL(Size getInputSize, const bool colorMode, int colorSamplingMethod, const bool useRetinaLogSampling, const double reductionFactor, const double samplingStrenght) { - return new ocl::RetinaOCLImpl(getInputSize, colorMode, colorSamplingMethod, useRetinaLogSampling, reductionFactor, samplingStrenght); + return makePtr(getInputSize, colorMode, colorSamplingMethod, useRetinaLogSampling, reductionFactor, samplingStrenght); } } /* namespace bioinspired */ diff --git a/modules/bioinspired/src/retinafasttonemapping.cpp b/modules/bioinspired/src/retinafasttonemapping.cpp index 468bedb9a..2713d7449 100644 --- a/modules/bioinspired/src/retinafasttonemapping.cpp +++ b/modules/bioinspired/src/retinafasttonemapping.cpp @@ -114,9 +114,9 @@ public: _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); + _multiuseFilter = makePtr(imageInput.height, imageInput.width, 2); // allocate the color manager (multiplexer/demultiplexer - _colorEngine = new RetinaColor(imageInput.height, imageInput.width); + _colorEngine = makePtr(imageInput.height, imageInput.width); // setup filter behaviors with default values setup(); } @@ -309,7 +309,7 @@ bool _convertCvMat2ValarrayBuffer(InputArray inputMat, std::valarray &out CV_EXPORTS Ptr createRetinaFastToneMapping(Size inputSize) { - return new RetinaFastToneMappingImpl(inputSize); + return makePtr(inputSize); } }// end of namespace bioinspired