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

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, 

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

modules/objdetect/src/lsvmtbbversion.cpp

 #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]), 

modules/objdetect/src/matching.cpp

@@ -2,8 +2,6 @@
 #include "_lsvm_matching.h"
 #include <stdio.h>
 
-#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];

modules/objdetect/test/test_latentsvmdetector.cpp

@@ -42,8 +42,6 @@
 
 #include "test_precomp.hpp"
 
-#undef HAVE_TBB
-
 #include <string>
 
 #ifdef HAVE_CVCONFIG_H