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

fixed some warning under Ubuntu in gpu module

Browse Source
This commit is contained in:
Alexey Spizhevoy 2010-12-13 15:56:29 +00:00
parent 4ac4ce3e40
commit a81b41fb08
3 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,8 +1134,8 @@ namespace cv
int nbins; int nbins;
double win_sigma; double win_sigma;
double threshold_L2hys; double threshold_L2hys;
int nlevels;
bool gamma_correction; bool gamma_correction;
int nlevels;
protected: protected:
void computeBlockHistograms(const GpuMat& img); void computeBlockHistograms(const GpuMat& img);

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

@ -269,7 +269,7 @@ void cv::gpu::matchTemplate(const GpuMat& image, const GpuMat& templ, GpuMat& re
static const Caller callers32F[] = { ::matchTemplate_32F_SQDIFF, 0, static const Caller callers32F[] = { ::matchTemplate_32F_SQDIFF, 0,
::matchTemplate_32F_CCORR, 0, 0, 0 }; ::matchTemplate_32F_CCORR, 0, 0, 0 };
const Caller* callers; const Caller* callers = 0;
switch (image.type()) switch (image.type())
{ {
case CV_8U: callers = callers8U; break; case CV_8U: callers = callers8U; break;

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

@ -69,8 +69,8 @@ public:
vector<int> rank; vector<int> rank;
vector<int> size; vector<int> size;
private: private:
DjSets(const DjSets&) {} DjSets(const DjSets&);
DjSets operator =(const DjSets&) {} void operator =(const DjSets&);
}; };