ok. enabled TBB in LatentSVM, but need to check if it works

diff --git a/modules/objdetect/src/_lsvm_matching.h b/modules/objdetect/src/_lsvm_matching.h
index 64bc2f6..5c8bb43 100644 (file)
--- 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 cac271f..339c936 100644 (file)
--- a/modules/objdetect/src/latentsvm.cpp
+++ b/modules/objdetect/src/latentsvm.cpp
@@ -2,8 +2,6 @@
 #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 99a880b..3c87930 100644 (file)
--- a/modules/objdetect/src/lsvmtbbversion.cpp
+++ b/modules/objdetect/src/lsvmtbbversion.cpp
@@ -1,7 +1,5 @@
 #include "precomp.hpp"\r
 \r
-#undef HAVE_TBB\r
-\r
 #ifdef HAVE_TBB\r
 #include "_lsvm_tbbversion.h"\r
 \r
@@ -48,7 +46,7 @@ public:
         for (i = 0; i < kLevels; i++)\r
         {\r
             level = procLevels[i];\r
-            partsLevel = level - H->lambda;\r
+            partsLevel = level - LAMBDA;//H->lambda;\r
             res = thresholdFunctionalScoreFixedLevel(\r
                 filters, n, H, level, b,\r
                 maxXBorder, maxYBorder, scoreThreshold, &(score[partsLevel]), \r

diff --git a/modules/objdetect/src/matching.cpp b/modules/objdetect/src/matching.cpp
index bb27002..df0c944 100644 (file)
--- a/modules/objdetect/src/matching.cpp
+++ b/modules/objdetect/src/matching.cpp
@@ -2,8 +2,6 @@
 #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
@@ -1577,8 +1575,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
     // Computation the number of levels for seaching object,\r
     // first lambda-levels are used for computation values\r
     // of score function for each position of root filter\r
-    numLevels = H->countLevel - H->lambda;\r
-\r
+    numLevels = H->numLevels;\r
     kLevels = (int *)malloc(sizeof(int) * threadsNum);\r
     procLevels = (int **)malloc(sizeof(int*) * threadsNum);\r
     computeBorderSize(maxXBorder, maxYBorder, &bx, &by);\r
@@ -1648,7 +1645,7 @@ int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
     for (i = 0; i < numLevels; i++)\r
     {\r
         // Computation the number of level\r
-        level = i + H->lambda; \r
+        level = i + LAMBDA;//H->lambda; \r
 \r
         // Addition a set of points\r
         f += tmpKPoints[i];\r

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