minor fix

diff --git a/modules/gpu/src/cuda/internal_shared.hpp b/modules/gpu/src/cuda/internal_shared.hpp
index 7c27675..2b52dbb 100644 (file)
--- a/modules/gpu/src/cuda/internal_shared.hpp
+++ b/modules/gpu/src/cuda/internal_shared.hpp
@@ -66,6 +66,8 @@
 #define OPENCV_DEVICE_NAMESPACE       ::cv::gpu::device\r
 #define OPENCV_DEVICE_NAMESPACE_      ::cv::gpu::device:: \r
 \r
+#ifdef __CUDACC__\r
+\r
 BEGIN_OPENCV_DEVICE_NAMESPACE\r
 \r
 typedef unsigned char uchar;\r
@@ -81,6 +83,8 @@ template<class T> static inline void bindTexture(const textureReference* tex, co
 \r
 END_OPENCV_DEVICE_NAMESPACE\r
 \r
+#endif\r
+\r
 namespace cv { namespace gpu \r
 {\r
     enum \r

diff --git a/modules/gpu/src/stereobm.cpp b/modules/gpu/src/stereobm.cpp
index 974b3dc..a23c914 100644 (file)
--- a/modules/gpu/src/stereobm.cpp
+++ b/modules/gpu/src/stereobm.cpp
@@ -59,7 +59,7 @@ BEGIN_OPENCV_DEVICE_NAMESPACE
 \r
 namespace stereobm\r
 {\r
-    void stereoBM_GPU(const DevMem2Db& left, const DevMem2Db& right, const DevMem2Db& disp, int ndisp, int winsz, const DevMem2D_<uint>& minSSD_buf, cudaStream_t & stream);\r
+    void stereoBM_GPU(const DevMem2Db& left, const DevMem2Db& right, const DevMem2Db& disp, int ndisp, int winsz, const DevMem2D_<unsigned int>& minSSD_buf, cudaStream_t & stream);\r
     void prefilter_xsobel(const DevMem2Db& input, const DevMem2Db& output, int prefilterCap /*= 31*/, cudaStream_t & stream);\r
     void postfilter_textureness(const DevMem2Db& input, int winsz, float avgTexturenessThreshold, const DevMem2Db& disp, cudaStream_t & stream);\r
 }\r

diff --git a/modules/gpu/src/surf.cpp b/modules/gpu/src/surf.cpp
index 3512844..9d2d37f 100644 (file)
--- a/modules/gpu/src/surf.cpp
+++ b/modules/gpu/src/surf.cpp
@@ -71,8 +71,8 @@ namespace surf
     void loadOctaveConstants(int octave, int layer_rows, int layer_cols);\r
 \r
     void bindImgTex(DevMem2Db img);\r
-    void bindSumTex(DevMem2D_<uint> sum);\r
-    void bindMaskSumTex(DevMem2D_<uint> maskSum);\r
+    void bindSumTex(DevMem2D_<unsigned int> sum);\r
+    void bindMaskSumTex(DevMem2D_<unsigned int> maskSum);\r
 \r
     void icvCalcLayerDetAndTrace_gpu(const PtrStepf& det, const PtrStepf& trace, int img_rows, int img_cols, int octave, int nOctaveLayers);\r
 \r