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

f3ae185f · cuda-geek · OpenCV Buildbot · e0426148 · 8b3c717e · f3ae185f
Commit f3ae185f authored Jan 31, 2013 by cuda-geek Committed by OpenCV Buildbot Jan 31, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

common.hpp modules/gpu/include/opencv2/gpu/device/common.hpp +1 -1

canny.cu modules/gpu/src/cuda/canny.cu +1 -0

No files found.
--- 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"