diff --git a/modules/objdetect/src/_lsvm_matching.h b/modules/objdetect/src/_lsvm_matching.h index 64bc2f650d4b50e4d5bc4a98610521a7a3727ca4..5c8bb43e2060c88fffb7049228913fdec33e79e6 100644 --- a/modules/objdetect/src/_lsvm_matching.h +++ b/modules/objdetect/src/_lsvm_matching.h @@ -11,8 +11,6 @@ #include "_lsvm_fft.h" #include "_lsvm_routine.h" -#undef HAVE_TBB - #ifdef HAVE_TBB #include "_lsvm_tbbversion.h" #endif @@ -358,8 +356,6 @@ 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 cac271fabb16735de1c5f3ed5067ebed9ab68755..339c936db9ba4b8451718e2f05890bc590f5bf53 100644 --- a/modules/objdetect/src/latentsvm.cpp +++ b/modules/objdetect/src/latentsvm.cpp @@ -2,8 +2,6 @@ #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 99a880b363da9be49011eb79cc5a141b314a5305..3c87930d317699c437efb5ce043ab65491a0db4f 100644 --- a/modules/objdetect/src/lsvmtbbversion.cpp +++ b/modules/objdetect/src/lsvmtbbversion.cpp @@ -1,7 +1,5 @@ #include "precomp.hpp" -#undef HAVE_TBB - #ifdef HAVE_TBB #include "_lsvm_tbbversion.h" @@ -48,7 +46,7 @@ public: for (i = 0; i < kLevels; i++) { level = procLevels[i]; - partsLevel = level - H->lambda; + partsLevel = level - LAMBDA;//H->lambda; res = thresholdFunctionalScoreFixedLevel( filters, n, H, level, b, maxXBorder, maxYBorder, scoreThreshold, &(score[partsLevel]), diff --git a/modules/objdetect/src/matching.cpp b/modules/objdetect/src/matching.cpp index bb27002b8d9f795eb2bd0c16ad404cfd8ab8dff9..df0c94442305a6753d5ff16b623b55fa8b679795 100644 --- a/modules/objdetect/src/matching.cpp +++ b/modules/objdetect/src/matching.cpp @@ -2,8 +2,6 @@ #include "_lsvm_matching.h" #include -#undef HAVE_TBB - #ifndef max #define max(a,b) (((a) > (b)) ? (a) : (b)) #endif @@ -1577,8 +1575,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, // Computation the number of levels for seaching object, // first lambda-levels are used for computation values // of score function for each position of root filter - numLevels = H->countLevel - H->lambda; - + numLevels = H->numLevels; kLevels = (int *)malloc(sizeof(int) * threadsNum); procLevels = (int **)malloc(sizeof(int*) * threadsNum); computeBorderSize(maxXBorder, maxYBorder, &bx, &by); @@ -1648,7 +1645,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, for (i = 0; i < numLevels; i++) { // Computation the number of level - level = i + H->lambda; + level = i + LAMBDA;//H->lambda; // Addition a set of points f += tmpKPoints[i]; diff --git a/modules/objdetect/test/test_latentsvmdetector.cpp b/modules/objdetect/test/test_latentsvmdetector.cpp index 2933e8cce1f62299f1caa156619ee2072ec32fa5..1dfe756599837bb07437eb7b9a34eb81451f37b8 100644 --- a/modules/objdetect/test/test_latentsvmdetector.cpp +++ b/modules/objdetect/test/test_latentsvmdetector.cpp @@ -42,8 +42,6 @@ #include "test_precomp.hpp" -#undef HAVE_TBB - #include #ifdef HAVE_CVCONFIG_H