vcs.maemo.org Git - opencv/blob - debian/patches/110_backport_r2242.diff

   1 diff --git a/apps/haartraining/cvboost.cpp b/apps/haartraining/cvboost.cpp
   2 index 210a14e..037874b 100644
   3 --- a/apps/haartraining/cvboost.cpp
   4 +++ b/apps/haartraining/cvboost.cpp
   5 @@ -64,6 +64,9 @@
   6  #include "_cvcommon.h"
   7  #include "cvclassifier.h"
   8
   9 +#ifdef _OPENMP
  10 +#include "omp.h"
  11 +#endif
  12
  13  #define CV_BOOST_IMPL
  14
  15 diff --git a/include/opencv/cxmisc.h b/include/opencv/cxmisc.h
  16 index d808c7e..c24cd95 100644
  17 --- a/include/opencv/cxmisc.h
  18 +++ b/include/opencv/cxmisc.h
  19 @@ -48,14 +48,7 @@
  20  #ifndef _CXCORE_MISC_H_
  21  #define _CXCORE_MISC_H_
  22
  23 -#ifdef HAVE_CONFIG_H
  24 -    #include "cvconfig.h"
  25 -#endif
  26 -
  27  #include <limits.h>
  28 -#ifdef _OPENMP
  29 -#include "omp.h"
  30 -#endif
  31
  32  /****************************************************************************************\
  33  *                              Compile-time tuning parameters                            *
  34 diff --git a/src/cvaux/vs/blobtrackingmsfg.cpp b/src/cvaux/vs/blobtrackingmsfg.cpp
  35 index e275535..8b74554 100644
  36 --- a/src/cvaux/vs/blobtrackingmsfg.cpp
  37 +++ b/src/cvaux/vs/blobtrackingmsfg.cpp
  38 @@ -40,6 +40,10 @@
  39
  40  #include "_cvaux.h"
  41
  42 +#ifdef _OPENMP
  43 +#include "omp.h"
  44 +#endif
  45 +
  46  // Uncomment to trade flexibility for speed
  47  //#define CONST_HIST_SIZE
  48
  49 diff --git a/src/cxcore/cxsystem.cpp b/src/cxcore/cxsystem.cpp
  50 index 0cdbe21..c69e72f 100644
  51 --- a/src/cxcore/cxsystem.cpp
  52 +++ b/src/cxcore/cxsystem.cpp
  53 @@ -50,6 +50,10 @@
  54  #include <time.h>
  55  #endif
  56
  57 +#ifdef _OPENMP
  58 +#include "omp.h"
  59 +#endif
  60 +
  61  #include <stdarg.h>
  62
  63  namespace cv
  64 --
  65 1.6.6
  66