generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

temporarily switch off TBB

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-07-14 11:51:43 +00:00
parent ca2433c212
commit 36ba3d691e
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/src/_lsvm_matching.h
View File

@ -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,
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
modules/objdetect/src/latentsvm.cpp
View File

@ -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

2
modules/objdetect/src/lsvmtbbversion.cpp
View File

@ -1,5 +1,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#undef HAVE_TBB
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"

2
modules/objdetect/src/matching.cpp
View File

@ -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

2
modules/objdetect/test/test_latentsvmdetector.cpp
View File

@ -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