From e154bce2599e3af5248ed36392de39c3f5c6f665 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sun, 17 Nov 2013 14:03:38 +0400 Subject: [PATCH] fixed compilation for vs2008 --- modules/objdetect/src/erfilter.cpp | 10 +++++++--- modules/photo/test/test_hdr.cpp | 3 --- modules/photo/test/test_precomp.hpp | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/objdetect/src/erfilter.cpp b/modules/objdetect/src/erfilter.cpp index 7ab258a..52743af 100644 --- a/modules/objdetect/src/erfilter.cpp +++ b/modules/objdetect/src/erfilter.cpp @@ -43,9 +43,13 @@ #include "precomp.hpp" #include -#ifndef INT32_MAX -#define __STDC_LIMIT_MACROS -#include +#if defined _MSC_VER && _MSC_VER == 1500 + typedef int int_fast32_t; +#else + #ifndef INT32_MAX + #define __STDC_LIMIT_MACROS + #include + #endif #endif using namespace std; diff --git a/modules/photo/test/test_hdr.cpp b/modules/photo/test/test_hdr.cpp index d095c01..1d232b3 100644 --- a/modules/photo/test/test_hdr.cpp +++ b/modules/photo/test/test_hdr.cpp @@ -40,9 +40,6 @@ //M*/ #include "test_precomp.hpp" -#include -#include -#include using namespace cv; using namespace std; diff --git a/modules/photo/test/test_precomp.hpp b/modules/photo/test/test_precomp.hpp index 5b22a1c..336e5f8 100644 --- a/modules/photo/test/test_precomp.hpp +++ b/modules/photo/test/test_precomp.hpp @@ -13,5 +13,9 @@ #include "opencv2/ts.hpp" #include "opencv2/photo.hpp" #include "opencv2/highgui.hpp" +#include +#include +#include +#include #endif -- 2.7.4