mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23037 from cudawarped:fix_for_cuda_12

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-27 03:43:59 +00:00
commit f637629c5a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/include/opencv2/core/cuda/common.hpp
View File

@ -99,7 +99,6 @@ namespace cv { namespace cuda
} }
#if (CUDART_VERSION >= 12000) #if (CUDART_VERSION >= 12000)
template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img) { CV_Error(cv::Error::GpuNotSupported, "Function removed in CUDA SDK 12"); }
template<class T> inline void createTextureObjectPitch2D(cudaTextureObject_t* tex, PtrStepSz<T>& img, const cudaTextureDesc& texDesc) { template<class T> inline void createTextureObjectPitch2D(cudaTextureObject_t* tex, PtrStepSz<T>& img, const cudaTextureDesc& texDesc) {
CV_Error(cv::Error::GpuNotSupported, "Function removed in CUDA SDK 12"); } CV_Error(cv::Error::GpuNotSupported, "Function removed in CUDA SDK 12"); }
#else #else
@ -123,8 +122,8 @@ namespace cv { namespace cuda
cudaSafeCall( cudaCreateTextureObject(tex, &resDesc, &texDesc, NULL) ); cudaSafeCall( cudaCreateTextureObject(tex, &resDesc, &texDesc, NULL) );
} }
}
#endif #endif
}
}} }}
//! @endcond //! @endcond