From 7ec4b59facd0f27a8dd89b0c5fdd418e3d2dd540 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 29 Jun 2010 15:12:07 +0000 Subject: [PATCH] added #include "cvconfig.h" to make TBB and other 3rd party libs work correctly --- modules/calib3d/src/precomp.hpp | 6 +++++- modules/contrib/src/precomp.hpp | 10 +++++++++- modules/core/src/precomp.hpp | 8 ++++++-- modules/features2d/src/precomp.hpp | 6 +++++- modules/imgproc/src/precomp.hpp | 8 ++++++-- modules/legacy/src/precomp.hpp | 10 +++++++--- modules/ml/src/precomp.hpp | 8 ++++++-- modules/objdetect/src/precomp.hpp | 6 +++++- modules/video/src/precomp.hpp | 6 +++++- 9 files changed, 54 insertions(+), 14 deletions(-) diff --git a/modules/calib3d/src/precomp.hpp b/modules/calib3d/src/precomp.hpp index fca0c53..569270f 100644 --- a/modules/calib3d/src/precomp.hpp +++ b/modules/calib3d/src/precomp.hpp @@ -43,7 +43,11 @@ #define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/calib3d/calib3d.hpp" diff --git a/modules/contrib/src/precomp.hpp b/modules/contrib/src/precomp.hpp index f3f8776..41555db 100644 --- a/modules/contrib/src/precomp.hpp +++ b/modules/contrib/src/precomp.hpp @@ -44,7 +44,15 @@ #define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/contrib/contrib.hpp" diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index adcd9d1..b51ec7d 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -40,14 +40,18 @@ // //M*/ -#ifndef _CXCORE_INTERNAL_H_ -#define _CXCORE_INTERNAL_H_ +#ifndef __OPENCV_PRECOMP_H__ +#define __OPENCV_PRECOMP_H__ #if defined _MSC_VER && _MSC_VER >= 1200 // disable warnings related to inline functions #pragma warning( disable: 4251 4711 4710 4514 ) #endif +#ifdef HAVE_CONFIG_H +#include +#endif + #include "opencv2/core/core.hpp" #include "opencv2/core/core_c.h" #include "opencv2/core/internal.hpp" diff --git a/modules/features2d/src/precomp.hpp b/modules/features2d/src/precomp.hpp index 2056096..16facaa 100644 --- a/modules/features2d/src/precomp.hpp +++ b/modules/features2d/src/precomp.hpp @@ -44,7 +44,11 @@ #define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/features2d/features2d.hpp" diff --git a/modules/imgproc/src/precomp.hpp b/modules/imgproc/src/precomp.hpp index 8ad5e99..7ea0fdb 100644 --- a/modules/imgproc/src/precomp.hpp +++ b/modules/imgproc/src/precomp.hpp @@ -40,14 +40,18 @@ // //M*/ -#ifndef _OPENCV_PRECOMP_HPP_ -#define _OPENCV_PRECOMP_HPP_ +#ifndef __OPENCV_PRECOMP_H__ +#define __OPENCV_PRECOMP_H__ #if defined _MSC_VER && _MSC_VER >= 1200 // disable warnings related to inline functions #pragma warning( disable: 4251 4711 4710 4514 ) #endif +#ifdef HAVE_CONFIG_H +#include +#endif + #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc_c.h" #include "opencv2/core/internal.hpp" diff --git a/modules/legacy/src/precomp.hpp b/modules/legacy/src/precomp.hpp index ba112fa..4492655 100644 --- a/modules/legacy/src/precomp.hpp +++ b/modules/legacy/src/precomp.hpp @@ -38,11 +38,15 @@ // the use of this software, even if advised of the possibility of such damage. // //M*/ -#ifndef __OPENCV_LEGACY_PRECOMP_H__ -#define __OPENCV_LEGACY_PRECOMP_H__ +#ifndef __OPENCV_PRECOMP_H__ +#define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/legacy/legacy.hpp" diff --git a/modules/ml/src/precomp.hpp b/modules/ml/src/precomp.hpp index ce8771b..c6238c2 100644 --- a/modules/ml/src/precomp.hpp +++ b/modules/ml/src/precomp.hpp @@ -38,13 +38,17 @@ // //M*/ -#ifndef __ML_INTERNAL_H__ -#define __ML_INTERNAL_H__ +#ifndef __OPENCV_PRECOMP_H__ +#define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 #pragma warning( disable: 4251 4514 4710 4711 4710 ) #endif +#ifdef HAVE_CONFIG_H +#include +#endif + #include "opencv2/ml/ml.hpp" #include "opencv2/core/core_c.h" #include "opencv2/core/internal.hpp" diff --git a/modules/objdetect/src/precomp.hpp b/modules/objdetect/src/precomp.hpp index f94416e..e4c912b 100644 --- a/modules/objdetect/src/precomp.hpp +++ b/modules/objdetect/src/precomp.hpp @@ -44,7 +44,11 @@ #define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/objdetect/objdetect.hpp" diff --git a/modules/video/src/precomp.hpp b/modules/video/src/precomp.hpp index f710c4c..f014337 100644 --- a/modules/video/src/precomp.hpp +++ b/modules/video/src/precomp.hpp @@ -44,7 +44,11 @@ #define __OPENCV_PRECOMP_H__ #if _MSC_VER >= 1200 -#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */ +#pragma warning( disable: 4251 4710 4711 4514 4996 ) +#endif + +#ifdef HAVE_CONFIG_H +#include #endif #include "opencv2/video/tracking.hpp" -- 2.7.4