Commit a81b41fb authored by Alexey Spizhevoy's avatar Alexey Spizhevoy

fixed some warning under Ubuntu in gpu module

parent 4ac4ce3e
......@@ -1134,8 +1134,8 @@ namespace cv
int nbins;
double win_sigma;
double threshold_L2hys;
int nlevels;
bool gamma_correction;
int nlevels;
protected:
void computeBlockHistograms(const GpuMat& img);
......
......@@ -269,7 +269,7 @@ void cv::gpu::matchTemplate(const GpuMat& image, const GpuMat& templ, GpuMat& re
static const Caller callers32F[] = { ::matchTemplate_32F_SQDIFF, 0,
::matchTemplate_32F_CCORR, 0, 0, 0 };
const Caller* callers;
const Caller* callers = 0;
switch (image.type())
{
case CV_8U: callers = callers8U; break;
......
......@@ -69,8 +69,8 @@ public:
vector<int> rank;
vector<int> size;
private:
DjSets(const DjSets&) {}
DjSets operator =(const DjSets&) {}
DjSets(const DjSets&);
void operator =(const DjSets&);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment