temporarily switch off TBB

14 years ago · 36ba3d691e
parent ca2433c212
commit 36ba3d691e
5 changed files with 12 additions and 0 deletions
--- a/modules/objdetect/src/_lsvm_matching.h
+++ b/modules/objdetect/src/_lsvm_matching.h
@ -11,6 +11,8 @@
 #include "_lsvm_fft.h"
 #include "_lsvm_routine.h"

+#undef HAVE_TBB
+
 #ifdef HAVE_TBB
 #include "_lsvm_tbbversion.h"
 #endif
@ -356,6 +358,8 @@ int thresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
                             CvPoint **points, int **levels, int *kPoints,
                             CvPoint ***partsDisplacement);

+#undef HAVE_TBB
+
 #ifdef HAVE_TBB
 /*
 // int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, 
--- a/modules/objdetect/src/latentsvm.cpp
+++ b/modules/objdetect/src/latentsvm.cpp
@ -2,6 +2,8 @@
 #include "_latentsvm.h"
 #include "_lsvm_matching.h"

+#undef HAVE_TBB
+
 /*
 // Transformation filter displacement from the block space 
 // to the space of pixels at the initial image
--- a/modules/objdetect/src/lsvmtbbversion.cpp
+++ b/modules/objdetect/src/lsvmtbbversion.cpp
@ -1,5 +1,7 @@
 #include "precomp.hpp"

+#undef HAVE_TBB
+
 #ifdef HAVE_TBB
 #include "_lsvm_tbbversion.h"

--- a/modules/objdetect/src/matching.cpp
+++ b/modules/objdetect/src/matching.cpp
@ -2,6 +2,8 @@
 #include "_lsvm_matching.h"
 #include <stdio.h>

+#undef HAVE_TBB
+
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
--- a/modules/objdetect/test/test_latentsvmdetector.cpp
+++ b/modules/objdetect/test/test_latentsvmdetector.cpp
@ -42,6 +42,8 @@

 #include "test_precomp.hpp"

+#undef HAVE_TBB
+
 #include <string>

 #ifdef HAVE_CVCONFIG_H