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

Merge pull request #383 from cuda-geek:apply-opencv-macosx-patch

Browse Source
This commit is contained in:
cuda-geek 2013-01-31 12:04:13 +04:00 committed by OpenCV Buildbot
commit f3ae185fd0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/include/opencv2/gpu/device/common.hpp
View File

@ -100,7 +100,7 @@ namespace cv { namespace gpu
typedef unsigned char uchar; typedef unsigned char uchar;
typedef unsigned short ushort; typedef unsigned short ushort;
typedef signed char schar; typedef signed char schar;
#ifdef _WIN32 #if defined (_WIN32) || defined (__APPLE__)
typedef unsigned int uint; typedef unsigned int uint;
#endif #endif

1
modules/gpu/src/cuda/canny.cu
View File

@ -43,6 +43,7 @@
#if !defined CUDA_DISABLER #if !defined CUDA_DISABLER
#include <utility> #include <utility>
#include <algorithm>//std::swap
#include "opencv2/gpu/device/common.hpp" #include "opencv2/gpu/device/common.hpp"
#include "opencv2/gpu/device/emulation.hpp" #include "opencv2/gpu/device/emulation.hpp"
#include "opencv2/gpu/device/transform.hpp" #include "opencv2/gpu/device/transform.hpp"