pull/13383/head
Vladislav Vinogradov 13 years ago
parent d305640749
commit 8e061ac801
  1. 4
      modules/gpu/src/cuda/internal_shared.hpp
  2. 2
      modules/gpu/src/stereobm.cpp
  3. 4
      modules/gpu/src/surf.cpp

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

@ -59,7 +59,7 @@ BEGIN_OPENCV_DEVICE_NAMESPACE
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 postfilter_textureness(const DevMem2Db& input, int winsz, float avgTexturenessThreshold, const DevMem2Db& disp, cudaStream_t & stream);
}

@ -71,8 +71,8 @@ namespace surf
void loadOctaveConstants(int octave, int layer_rows, int layer_cols);
void bindImgTex(DevMem2Db img);
void bindSumTex(DevMem2D_<uint> sum);
void bindMaskSumTex(DevMem2D_<uint> maskSum);
void bindSumTex(DevMem2D_<unsigned int> sum);
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);

Loading…
Cancel
Save