Merge pull request #2349 from jet47:fix-bug-3552

9fcb0b22 · Roman Donchenko · OpenCV Buildbot · aad289a3 · 150e522b · 9fcb0b22
Commit 9fcb0b22 authored Feb 17, 2014 by Roman Donchenko Committed by OpenCV Buildbot Feb 17, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

canny.cu modules/gpu/src/cuda/canny.cu +4 -3

No files found.
--- a/modules/gpu/src/cuda/canny.cu
+++ b/modules/gpu/src/cuda/canny.cu
@@ -42,8 +42,6 @@

 #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"
@@ -463,7 +461,10 @@ namespace canny

            count = min(count, map.cols * map.rows);

-            std::swap(st1, st2);
+            //std::swap(st1, st2);
+            short2* tmp = st1;
+            st1 = st2;
+            st2 = tmp;
        }
    }
 }