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

Fixed compilation of pthread-based parallel_for with gcc 4.4.3

Browse Source
This commit is contained in:
Maksim Shabunin 2015-06-09 13:59:48 +03:00
parent 424c2bddb3
commit 1f983ec39c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/parallel.cpp
View File

@ -132,8 +132,14 @@
namespace cv namespace cv
{ {
ParallelLoopBody::~ParallelLoopBody() {} ParallelLoopBody::~ParallelLoopBody() {}
#if defined HAVE_PTHREADS && HAVE_PTHREADS
void parallel_for_pthreads(const cv::Range& range, const cv::ParallelLoopBody& body, double nstripes);
size_t parallel_pthreads_get_threads_num();
void parallel_pthreads_set_threads_num(int num);
#endif
} }
namespace namespace
{ {
#ifdef CV_PARALLEL_FRAMEWORK #ifdef CV_PARALLEL_FRAMEWORK
@ -301,7 +307,7 @@ void cv::parallel_for_(const cv::Range& range, const cv::ParallelLoopBody& body,
} }
#elif defined HAVE_PTHREADS #elif defined HAVE_PTHREADS
void parallel_for_pthreads(const Range& range, const ParallelLoopBody& body, double nstripes);
parallel_for_pthreads(range, body, nstripes); parallel_for_pthreads(range, body, nstripes);
#else #else
@ -361,8 +367,6 @@ int cv::getNumThreads(void)
#elif defined HAVE_PTHREADS #elif defined HAVE_PTHREADS
size_t parallel_pthreads_get_threads_num();
return parallel_pthreads_get_threads_num(); return parallel_pthreads_get_threads_num();
#else #else
@ -424,8 +428,6 @@ void cv::setNumThreads( int threads )
#elif defined HAVE_PTHREADS #elif defined HAVE_PTHREADS
void parallel_pthreads_set_threads_num(int num);
parallel_pthreads_set_threads_num(threads); parallel_pthreads_set_threads_num(threads);
#endif #endif