temporarily switch off TBB

diff --git a/modules/objdetect/src/_lsvm_matching.h b/modules/objdetect/src/_lsvm_matching.h
index 5c8bb43..64bc2f6 100644 (file)
--- 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, 

diff --git a/modules/objdetect/src/latentsvm.cpp b/modules/objdetect/src/latentsvm.cpp
index 339c936..cac271f 100644 (file)
--- a/modules/objdetect/src/latentsvm.cpp
+++ b/modules/objdetect/src/latentsvm.cpp
@@ -2,6 +2,8 @@
 #include "_latentsvm.h"\r
 #include "_lsvm_matching.h"\r
 \r
+#undef HAVE_TBB\r
+\r
 /*\r
 // Transformation filter displacement from the block space \r
 // to the space of pixels at the initial image\r

diff --git a/modules/objdetect/src/lsvmtbbversion.cpp b/modules/objdetect/src/lsvmtbbversion.cpp
index bac48ac..99a880b 100644 (file)
--- a/modules/objdetect/src/lsvmtbbversion.cpp
+++ b/modules/objdetect/src/lsvmtbbversion.cpp
@@ -1,5 +1,7 @@
 #include "precomp.hpp"\r
 \r
+#undef HAVE_TBB\r
+\r
 #ifdef HAVE_TBB\r
 #include "_lsvm_tbbversion.h"\r
 \r

diff --git a/modules/objdetect/src/matching.cpp b/modules/objdetect/src/matching.cpp
index 2cdd8b5..bb27002 100644 (file)
--- a/modules/objdetect/src/matching.cpp
+++ b/modules/objdetect/src/matching.cpp
@@ -2,6 +2,8 @@
 #include "_lsvm_matching.h"\r
 #include <stdio.h>\r
 \r
+#undef HAVE_TBB\r
+\r
 #ifndef max\r
 #define max(a,b)            (((a) > (b)) ? (a) : (b))\r
 #endif\r

diff --git a/modules/objdetect/test/test_latentsvmdetector.cpp b/modules/objdetect/test/test_latentsvmdetector.cpp
index 1dfe756..2933e8c 100644 (file)
--- 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