optflow gpu compilation fix under vs2010

diff --git a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu b/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
index 6639609..06d88ea 100644 (file)
--- a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
+++ b/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
@@ -62,7 +62,7 @@
 \r
 #include "NPP_staging/NPP_staging.hpp"\r
 #include "NCVBroxOpticalFlow.hpp"\r
-\r
+#include "opencv2/gpu/device/utility.hpp"\r
 \r
 \r
 ////////////////////////////////////////////\r
@@ -131,6 +131,7 @@ template<typename _Tp> inline shared_ptr<_Tp>& shared_ptr<_Tp>::operator = (cons
     return *this;\r
 }\r
 \r
+\r
 ////////////////////////////////////////////\r
 //using std::tr1::shared_ptr;\r
 \r
@@ -1181,8 +1182,8 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,
                                ScaleVector(ptrVNew->ptr(), ptrVNew->ptr(), 1.0f/scale_factor, ns * nh, stream);\r
             }\r
 \r
-            std::swap<FloatVector*>(ptrU, ptrUNew);\r
-            std::swap<FloatVector*>(ptrV, ptrVNew);\r
+            cv::gpu::device::swap<FloatVector*>(ptrU, ptrUNew);\r
+            cv::gpu::device::swap<FloatVector*>(ptrV, ptrVNew);\r
         }\r
         scale /= scale_factor;\r
     }\r

diff --git a/modules/gpu/src/opencv2/gpu/device/utility.hpp b/modules/gpu/src/opencv2/gpu/device/utility.hpp
index 031fd7f..990158e 100644 (file)
--- a/modules/gpu/src/opencv2/gpu/device/utility.hpp
+++ b/modules/gpu/src/opencv2/gpu/device/utility.hpp
@@ -58,7 +58,7 @@ namespace cv {  namespace gpu { namespace device
     ///////////////////////////////////////////////////////////////////////////////\r
     // swap\r
 \r
-    template <typename T> void __device__ __forceinline__ swap(T& a, T& b) \r
+    template <typename T> void __device__ __host__ __forceinline__ swap(T& a, T& b) \r
     {\r
         const T temp = a;\r
         a = b;\r