mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation with CUDA5.0 (#1982, thanks to Rodrigo)

Browse Source
This commit is contained in:
Anatoly Baksheev 2012-05-25 09:44:00 +00:00
parent 6c86cce21f
commit 543825f2f5
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/element_operations.cpp
View File

@ -998,7 +998,11 @@ namespace
typedef NppTypeTraits<CV_16U>::npp_t npp_t; typedef NppTypeTraits<CV_16U>::npp_t npp_t;
typedef Npp32u scalar_t; typedef Npp32u scalar_t;
#if (CUDA_VERSION <= 4020)
typedef NppStatus (*func_t)(const Npp16u* pSrc1, int nSrc1Step, Npp16u* pDst, int nDstStep, NppiSize oSizeROI, Npp32u nConstant); typedef NppStatus (*func_t)(const Npp16u* pSrc1, int nSrc1Step, Npp16u* pDst, int nDstStep, NppiSize oSizeROI, Npp32u nConstant);
#else
typedef NppStatus (*func_t)(const Npp16u * pSrc1, int nSrc1Step, Npp16u * pDst, int nDstStep, NppiSize oSizeROI, Npp16u nConstant);
#endif
}; };
template <int DEPTH, typename NppAbsDiffCFunc<DEPTH>::func_t func> struct NppAbsDiffC template <int DEPTH, typename NppAbsDiffCFunc<DEPTH>::func_t func> struct NppAbsDiffC

4
modules/gpu/src/matrix_reductions.cpp
View File

@ -128,7 +128,11 @@ void cv::gpu::meanStdDev(const GpuMat& src, Scalar& mean, Scalar& stddev, GpuMat
DeviceBuffer dbuf(2); DeviceBuffer dbuf(2);
int bufSize; int bufSize;
#if (CUDA_VERSION <= 4020)
nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) ); nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) );
#else
nppSafeCall( nppiMeanStdDevGetBufferHostSize_8u_C1R(sz, &bufSize) );
#endif
ensureSizeIsEnough(1, bufSize, CV_8UC1, buf); ensureSizeIsEnough(1, bufSize, CV_8UC1, buf);