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

fixed some warnings

Browse Source
This commit is contained in:
Andrey Morozov 2010-08-18 13:47:10 +00:00
parent a3582b4780
commit aaa8678cff
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@ -288,14 +288,14 @@ namespace cv
int rows, cols; int rows, cols;
size_t step; size_t step;
int alloc_type;
uchar* data; uchar* data;
int* refcount; int* refcount;
uchar* datastart; uchar* datastart;
uchar* dataend; uchar* dataend;
int alloc_type;
}; };
//////////////////////////////// CudaStream //////////////////////////////// //////////////////////////////// CudaStream ////////////////////////////////
@ -374,9 +374,10 @@ namespace cv
// It queries current active device. // It queries current active device.
static bool checkIfGpuCallReasonable(); static bool checkIfGpuCallReasonable();
int preset;
int ndisp; int ndisp;
int winSize; int winSize;
int preset;
// If avergeTexThreshold == 0 => post procesing is disabled // If avergeTexThreshold == 0 => post procesing is disabled
// If avergeTexThreshold != 0 then disparity is set 0 in each point (x,y) where for left image // If avergeTexThreshold != 0 then disparity is set 0 in each point (x,y) where for left image

2
modules/gpu/include/opencv2/gpu/matrix_operations.hpp
View File

@ -403,6 +403,8 @@ inline CudaMem CudaMem::clone() const
} }
inline void CudaMem::create(Size _size, int _type, int _alloc_type) { create(_size.height, _size.width, _type, _alloc_type); } inline void CudaMem::create(Size _size, int _type, int _alloc_type) { create(_size.height, _size.width, _type, _alloc_type); }
//CCP void CudaMem::create(int _rows, int _cols, int _type, int _alloc_type); //CCP void CudaMem::create(int _rows, int _cols, int _type, int _alloc_type);
//CPP void CudaMem::release(); //CPP void CudaMem::release();

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

@ -73,7 +73,7 @@ cv::gpu::StereoBM_GPU::StereoBM_GPU()
: preset(BASIC_PRESET), ndisp(DEFAULT_NDISP), winSize(DEFAULT_WINSZ), avergeTexThreshold(defaultAvgTexThreshold) {} : preset(BASIC_PRESET), ndisp(DEFAULT_NDISP), winSize(DEFAULT_WINSZ), avergeTexThreshold(defaultAvgTexThreshold) {}
cv::gpu::StereoBM_GPU::StereoBM_GPU(int preset_, int ndisparities_, int winSize_) cv::gpu::StereoBM_GPU::StereoBM_GPU(int preset_, int ndisparities_, int winSize_)
: ndisp(ndisparities_), winSize(winSize_), preset(preset_), avergeTexThreshold(defaultAvgTexThreshold) : preset(preset_), ndisp(ndisparities_), winSize(winSize_), avergeTexThreshold(defaultAvgTexThreshold)
{ {
const int max_supported_ndisp = 1 << (sizeof(unsigned char) * 8); const int max_supported_ndisp = 1 << (sizeof(unsigned char) * 8);
CV_Assert(0 < ndisp && ndisp <= max_supported_ndisp); CV_Assert(0 < ndisp && ndisp <= max_supported_ndisp);