From be54f1237a7de7a21e12c9ea69087e70090682e1 Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Tue, 16 Nov 2010 07:40:37 +0000
Subject: [PATCH] minor fix

---
 modules/gpu/include/opencv2/gpu/matrix_operations.hpp | 2 +-
 modules/gpu/src/cuda/cuda_shared.hpp                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gpu/include/opencv2/gpu/matrix_operations.hpp b/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
index e576d00c5d..51e9cfc5de 100644
--- a/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
+++ b/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
@@ -207,7 +207,7 @@ inline GpuMat& GpuMat::operator = (const GpuMat& m)
 inline GpuMat& GpuMat::operator = (const Mat& m) { upload(m); return *this; }
 
 template <class T> inline GpuMat::operator DevMem2D_<T>() const { return DevMem2D_<T>(rows, cols, (T*)data, step); }
-template <class T> inline GpuMat::operator PtrStep_<T>() const { return PtrStep_<T>(*this); }
+template <class T> inline GpuMat::operator PtrStep_<T>() const { return PtrStep_<T>(static_cast< DevMem2D_<T> >(*this)); }
 
 //CPP: void GpuMat::upload(const Mat& m);
 
diff --git a/modules/gpu/src/cuda/cuda_shared.hpp b/modules/gpu/src/cuda/cuda_shared.hpp
index c0ebb53c9f..ca82059d10 100644
--- a/modules/gpu/src/cuda/cuda_shared.hpp
+++ b/modules/gpu/src/cuda/cuda_shared.hpp
@@ -64,8 +64,8 @@ namespace cv
         }
 
         template<class T> static inline void uploadConstant(const char* name, const T& value, cudaStream_t stream) 
-        { 
-            cudaSafeCall( cudaMemcpyToSymbolAsyc(name, &value, sizeof(T), 0, cudaMemcpyHostToDevice, stream) ); 
+        {
+            cudaSafeCall( cudaMemcpyToSymbolAsync(name, &value, sizeof(T), 0, cudaMemcpyHostToDevice, stream) ); 
         }        
 
         template<class T> static inline void bindTexture(const char* name, const DevMem2D_<T>& img/*, bool normalized = false,