Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.

This commit is contained in:
Andrey Kamaev
2012-11-01 12:44:10 +04:00
parent 7267d518d5
commit fd4909360f
6 changed files with 35 additions and 17 deletions

View File

@@ -48,8 +48,16 @@
#include "precomp.hpp"
#if defined WIN32 || defined WINCE
#include <windows.h>
#undef small
#undef min
#undef max
#undef abs
#endif
#if defined __SSE2__ || (defined _M_IX86_FP && 2 == _M_IX86_FP)
#include "emmintrin.h"
#include "emmintrin.h"
#endif
namespace cv