From 37fe2a252a57ce281efcf00884d7216d380bae62 Mon Sep 17 00:00:00 2001 From: Alexandre Benoit Date: Fri, 31 Aug 2012 14:55:32 +0200 Subject: [PATCH] updated Retina module code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper... compile error corrected --- modules/contrib/doc/contrib.rst | 2 +- modules/contrib/src/templatebuffer.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/contrib/doc/contrib.rst b/modules/contrib/doc/contrib.rst index 85a55a3468..c3ceb20f51 100644 --- a/modules/contrib/doc/contrib.rst +++ b/modules/contrib/doc/contrib.rst @@ -9,4 +9,4 @@ The module contains some recently added functionality that has not been stabiliz stereo FaceRecognizer Documentation - retina Documentation + Retina Documentation diff --git a/modules/contrib/src/templatebuffer.hpp b/modules/contrib/src/templatebuffer.hpp index 50aedce38a..1ce4d593b8 100644 --- a/modules/contrib/src/templatebuffer.hpp +++ b/modules/contrib/src/templatebuffer.hpp @@ -388,8 +388,8 @@ public: std::cout<<"this->min()"<min()<<"minThreshold="<Buffer(); -#ifdef MAKE_PARALLEL // call the TemplateBuffer TBB clipping method - parallel_for_(tbb::blocked_range(0,this->size()), Parallel_clipBufferValues(bufferPTR, updatedLowValue, updatedHighValue)); +#ifdef MAKE_PARALLEL // call the TemplateBuffer multitreaded clipping method + parallel_for_(cv::Range(0,this->size()), Parallel_clipBufferValues(bufferPTR, updatedLowValue, updatedHighValue)); #else for (unsigned int i=0;isize();++i, ++bufferPTR)