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

Merged the branch /branches/opencv_pthread_framework/opencv into the trunk.

Browse Source 
The branch contains changes, concerning adding ThreadingFramework -- temporary lightweight decision for ARM instead of Intel TBB.
Also some changes in Android highgui camera class were made.
This commit is contained in:
Leonid Beynenson
2011-04-29 14:20:24 +00:00
parent e202b13069
commit 2806db93d8
6 changed files with 127 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/core/include/opencv2/core/internal.hpp
View File

@@ -185,11 +185,24 @@ CV_INLINE IppiSize ippiSize(int width, int height)
int _begin, _end, _grainsize;
};
#ifdef HAVE_THREADING_FRAMEWORK
#include "threading_framework.hpp"
template<typename Body>
static void parallel_for( const BlockedRange& range, const Body& body )
{
tf::parallel_for<Body>(range, body);
}
typedef tf::ConcurrentVector<Rect> ConcurrentRectVector;
#else
template<typename Body> static inline
void parallel_for( const BlockedRange& range, const Body& body )
{
body(range);
body(range);
}
typedef std::vector<Rect> ConcurrentRectVector;
#endif
template<typename Iterator, typename Body> static inline
void parallel_do( Iterator first, Iterator last, const Body& body )
@@ -206,7 +219,6 @@ CV_INLINE IppiSize ippiSize(int width, int height)
body(range);
}
typedef std::vector<Rect> ConcurrentRectVector;
}
#endif
#endif