Merged the branch /branches/opencv_pthread_framework/opencv into the trunk.
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:
@@ -157,6 +157,9 @@
|
||||
/* Intel Threading Building Blocks */
|
||||
#cmakedefine HAVE_TBB
|
||||
|
||||
/* Threading Framework --- temporary decision for ARM instead of Intel TBB */
|
||||
#cmakedefine HAVE_THREADING_FRAMEWORK
|
||||
|
||||
/* Eigen2 Matrix & Linear Algebra Library */
|
||||
#cmakedefine HAVE_EIGEN2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user