generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Vladislav Vinogradov 2011-11-09 13:33:44 +00:00
parent d305640749
commit 8e061ac801
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/cuda/internal_shared.hpp
View File

@ -66,6 +66,8 @@
#define OPENCV_DEVICE_NAMESPACE ::cv::gpu::device #define OPENCV_DEVICE_NAMESPACE ::cv::gpu::device
#define OPENCV_DEVICE_NAMESPACE_ ::cv::gpu::device:: #define OPENCV_DEVICE_NAMESPACE_ ::cv::gpu::device::
#ifdef __CUDACC__
BEGIN_OPENCV_DEVICE_NAMESPACE BEGIN_OPENCV_DEVICE_NAMESPACE
typedef unsigned char uchar; typedef unsigned char uchar;
@ -81,6 +83,8 @@ template<class T> static inline void bindTexture(const textureReference* tex, co
END_OPENCV_DEVICE_NAMESPACE END_OPENCV_DEVICE_NAMESPACE
#endif
namespace cv { namespace gpu namespace cv { namespace gpu
{ {
enum enum

2
modules/gpu/src/stereobm.cpp
View File

@ -59,7 +59,7 @@ BEGIN_OPENCV_DEVICE_NAMESPACE
namespace stereobm namespace stereobm
{ {
void stereoBM_GPU(const DevMem2Db& left, const DevMem2Db& right, const DevMem2Db& disp, int ndisp, int winsz, const DevMem2D_<uint>& minSSD_buf, cudaStream_t & stream); 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);
void prefilter_xsobel(const DevMem2Db& input, const DevMem2Db& output, int prefilterCap /*= 31*/, cudaStream_t & stream); void prefilter_xsobel(const DevMem2Db& input, const DevMem2Db& output, int prefilterCap /*= 31*/, cudaStream_t & stream);
void postfilter_textureness(const DevMem2Db& input, int winsz, float avgTexturenessThreshold, const DevMem2Db& disp, cudaStream_t & stream); void postfilter_textureness(const DevMem2Db& input, int winsz, float avgTexturenessThreshold, const DevMem2Db& disp, cudaStream_t & stream);
} }

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

@ -71,8 +71,8 @@ namespace surf
void loadOctaveConstants(int octave, int layer_rows, int layer_cols); void loadOctaveConstants(int octave, int layer_rows, int layer_cols);
void bindImgTex(DevMem2Db img); void bindImgTex(DevMem2Db img);
void bindSumTex(DevMem2D_<uint> sum); void bindSumTex(DevMem2D_<unsigned int> sum);
void bindMaskSumTex(DevMem2D_<uint> maskSum); void bindMaskSumTex(DevMem2D_<unsigned int> maskSum);
void icvCalcLayerDetAndTrace_gpu(const PtrStepf& det, const PtrStepf& trace, int img_rows, int img_cols, int octave, int nOctaveLayers); void icvCalcLayerDetAndTrace_gpu(const PtrStepf& det, const PtrStepf& trace, int img_rows, int img_cols, int octave, int nOctaveLayers);