From 8b3c717e8f4e5c07e403561a22717fd9905561a0 Mon Sep 17 00:00:00 2001
From: "marina.kolpakova" <marina.kolpakova@itseez.com>
Date: Wed, 30 Jan 2013 20:20:06 +0400
Subject: [PATCH] apply patch #2686

---
 modules/gpu/include/opencv2/gpu/device/common.hpp | 2 +-
 modules/gpu/src/cuda/canny.cu                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gpu/include/opencv2/gpu/device/common.hpp b/modules/gpu/include/opencv2/gpu/device/common.hpp
index 7fb1036e84..64d82c83b0 100644
--- 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
 
diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu
index 0a5daebaaf..1afcddc9c9 100644
--- 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"