Commit 36ba3d69 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

temporarily switch off TBB

parent ca2433c2
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "_lsvm_fft.h" #include "_lsvm_fft.h"
#include "_lsvm_routine.h" #include "_lsvm_routine.h"
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"
#endif #endif
...@@ -356,6 +358,8 @@ int thresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, ...@@ -356,6 +358,8 @@ int thresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
CvPoint **points, int **levels, int *kPoints, CvPoint **points, int **levels, int *kPoints,
CvPoint ***partsDisplacement); CvPoint ***partsDisplacement);
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
/* /*
// int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n, // int tbbThresholdFunctionalScore(const CvLSVMFilterObject **all_F, int n,
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include "_latentsvm.h" #include "_latentsvm.h"
#include "_lsvm_matching.h" #include "_lsvm_matching.h"
#undef HAVE_TBB
/* /*
// Transformation filter displacement from the block space // Transformation filter displacement from the block space
// to the space of pixels at the initial image // to the space of pixels at the initial image
......
#include "precomp.hpp" #include "precomp.hpp"
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include "_lsvm_matching.h" #include "_lsvm_matching.h"
#include <stdio.h> #include <stdio.h>
#undef HAVE_TBB
#ifndef max #ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif #endif
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#undef HAVE_TBB
#include <string> #include <string>
#ifdef HAVE_CVCONFIG_H #ifdef HAVE_CVCONFIG_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment