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

do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 22:38:57 +00:00
parent ba60094aca
commit 758e826d2e
24 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/dxt.cpp
View File

@@ -45,7 +45,7 @@ namespace cv
{
// On Win64 optimized versions of DFT and DCT fail the tests (fixed in VS2010)
#if (defined WIN64 || defined _WIN64) && defined _MSC_VER && _MSC_VER < 1600
#if defined _MSC_VER && !defined CV_ICC && defined _M_X64 && _MSC_VER < 1600
#pragma optimize("", off)
#endif