generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Vladislav Vinogradov 2010-11-16 07:40:37 +00:00
parent cc6a87fc9d
commit be54f1237a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/include/opencv2/gpu/matrix_operations.hpp
View File

@ -207,7 +207,7 @@ inline GpuMat& GpuMat::operator = (const GpuMat& m)
inline GpuMat& GpuMat::operator = (const Mat& m) { upload(m); return *this; } 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 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); //CPP: void GpuMat::upload(const Mat& m);

2
modules/gpu/src/cuda/cuda_shared.hpp
View File

@ -65,7 +65,7 @@ namespace cv
template<class T> static inline void uploadConstant(const char* name, const T& value, cudaStream_t stream) 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, template<class T> static inline void bindTexture(const char* name, const DevMem2D_<T>& img/*, bool normalized = false,