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

2012-05-25 09:44:00 +00:00
parent 6c86cce21f
commit 543825f2f5
2 changed files with 8 additions and 0 deletions
--- a/modules/gpu/src/element_operations.cpp
+++ b/modules/gpu/src/element_operations.cpp
@@ -998,7 +998,11 @@ namespace
        typedef NppTypeTraits<CV_16U>::npp_t npp_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);
+#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