From 21f5cc7e6ede6348a9c488992e190cc00f13f89e Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Wed, 9 Nov 2011 14:23:13 +0000
Subject: [PATCH] minor

---
 modules/gpu/src/cuda/canny.cu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu
index 0c0f5d9a2c..5f31fa7092 100644
--- a/modules/gpu/src/cuda/canny.cu
+++ b/modules/gpu/src/cuda/canny.cu
@@ -456,7 +456,7 @@ void edgesHysteresisGlobal_gpu(PtrStepi map, ushort2* st1, ushort2* st2, int row
         cudaSafeCall( cudaMemset(counter_ptr, 0, sizeof(unsigned int)) );
 
         dim3 block(128, 1, 1);
-        dim3 grid(min(count, 65535u), divUp(count, 65535), 1);
+        dim3 grid(std::min(count, 65535u), divUp(count, 65535), 1);
         edgesHysteresisGlobal<<<grid, block>>>(map, st1, st2, rows, cols, count);
         cudaSafeCall( cudaGetLastError() );