1 | Index: modules/gpu/src/matrix_reductions.cpp
|
2 | ===================================================================
|
3 | --- modules/gpu/src/matrix_reductions.cpp (revision 8447)
|
4 | +++ modules/gpu/src/matrix_reductions.cpp (working copy)
|
5 | @@ -128,7 +128,8 @@
|
6 | DeviceBuffer dbuf(2);
|
7 |
|
8 | int bufSize;
|
9 | - nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) );
|
10 | + //nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) );
|
11 | + nppSafeCall( nppiMeanStdDevGetBufferHostSize_8u_C1R(sz, &bufSize) );
|
12 |
|
13 | ensureSizeIsEnough(1, bufSize, CV_8UC1, buf);
|
14 |
|
15 | Index: modules/gpu/src/element_operations.cpp
|
16 | ===================================================================
|
17 | --- modules/gpu/src/element_operations.cpp (revision 8447)
|
18 | +++ modules/gpu/src/element_operations.cpp (working copy)
|
19 | @@ -998,7 +998,9 @@
|
20 | typedef NppTypeTraits<CV_16U>::npp_t npp_t;
|
21 | typedef Npp32u scalar_t;
|
22 |
|
23 | - typedef NppStatus (*func_t)(const Npp16u* pSrc1, int nSrc1Step, Npp16u* pDst, int nDstStep, NppiSize oSizeROI, Npp32u nConstant);
|
24 | + //typedef NppStatus (*func_t)(const Npp16u* pSrc1, int nSrc1Step, Npp16u* pDst, int nDstStep, NppiSize oSizeROI, Npp32u nConstant);
|
25 | + typedef NppStatus (*func_t)(const Npp16u * pSrc1, int nSrc1Step, Npp16u * pDst, int nDstStep, NppiSize oSizeROI, Npp16u nConstant);
|
26 | +
|
27 | };
|
28 |
|
29 | template <int DEPTH, typename NppAbsDiffCFunc<DEPTH>::func_t func> struct NppAbsDiffC
|