From 36ba3d691e3383142f39dfa93762f3b8b9607f47 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 14 Jul 2011 11:51:43 +0000 Subject: [PATCH] temporarily switch off TBB --- modules/objdetect/src/_lsvm_matching.h | 4 ++++ modules/objdetect/src/latentsvm.cpp | 2 ++ modules/objdetect/src/lsvmtbbversion.cpp | 2 ++ modules/objdetect/src/matching.cpp | 2 ++ modules/objdetect/test/test_latentsvmdetector.cpp | 2 ++ 5 files changed, 12 insertions(+) diff --git a/modules/objdetect/src/_lsvm_matching.h b/modules/objdetect/src/_lsvm_matching.h index 5c8bb43..64bc2f6 100644 --- 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 --- 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 diff --git a/modules/objdetect/src/lsvmtbbversion.cpp b/modules/objdetect/src/lsvmtbbversion.cpp index bac48ac..99a880b 100644 --- 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" diff --git a/modules/objdetect/src/matching.cpp b/modules/objdetect/src/matching.cpp index 2cdd8b5..bb27002 100644 --- a/modules/objdetect/src/matching.cpp +++ b/modules/objdetect/src/matching.cpp @@ -2,6 +2,8 @@ #include "_lsvm_matching.h" #include +#undef HAVE_TBB + #ifndef max #define max(a,b) (((a) > (b)) ? (a) : (b)) #endif diff --git a/modules/objdetect/test/test_latentsvmdetector.cpp b/modules/objdetect/test/test_latentsvmdetector.cpp index 1dfe756..2933e8c 100644 --- 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 #ifdef HAVE_CVCONFIG_H -- 2.7.4