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

12 years ago · f3ae185fd0
parent e0426148ba 8b3c717e8f
commit f3ae185fd0
2 changed files with 2 additions and 1 deletions
--- a/modules/gpu/include/opencv2/gpu/device/common.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/common.hpp
@ -100,7 +100,7 @@ namespace cv { namespace gpu
        typedef unsigned char uchar;
        typedef unsigned short ushort;
        typedef signed char schar;
-        #ifdef _WIN32
+        #if defined (_WIN32) || defined (__APPLE__)
            typedef unsigned int uint;
        #endif

--- a/modules/gpu/src/cuda/canny.cu
+++ b/modules/gpu/src/cuda/canny.cu
@ -43,6 +43,7 @@
 #if !defined CUDA_DISABLER

 #include <utility>
+#include <algorithm>//std::swap
 #include "opencv2/gpu/device/common.hpp"
 #include "opencv2/gpu/device/emulation.hpp"
 #include "opencv2/gpu/device/transform.hpp"