Commit 3fea2620 authored by peng xiao's avatar peng xiao

Fix some compilation errors and warnings.

parent 77501f3e
......@@ -1727,6 +1727,9 @@ static void convolve_run_fft(const oclMat &image, const oclMat &templ, oclMat &r
#else
CV_Error(CV_StsNotImplemented, "OpenCL DFT is not implemented");
#define UNUSED(x) (void)(x);
UNUSED(image) UNUSED(templ) UNUSED(result) UNUSED(ccorr) UNUSED(buf)
#undef UNUSED
#endif
}
static void convolve_run(const oclMat &src, const oclMat &temp1, oclMat &dst, String kernelName, const char **kernelString)
......
......@@ -112,6 +112,9 @@ namespace cv
else
return false;
#else
#define UNUSED(x) (void)(x);
UNUSED(method) UNUSED(depth) UNUSED(size)
#undef UNUSED
return true;
#endif
}
......
......@@ -55,7 +55,7 @@ inline cfloat conjf(cfloat a)
}
__kernel void
mulAndScaleSpectrumsKernel(
mulAndScaleSpectrumsKernel(
__global const cfloat* a,
__global const cfloat* b,
float scale,
......@@ -63,7 +63,7 @@ __kernel void
uint cols,
uint rows,
uint mstep
)
)
{
const uint x = get_global_id(0);
const uint y = get_global_id(1);
......@@ -75,7 +75,7 @@ __kernel void
}
}
__kernel void
mulAndScaleSpectrumsKernel_CONJ(
mulAndScaleSpectrumsKernel_CONJ(
__global const cfloat* a,
__global const cfloat* b,
float scale,
......@@ -83,7 +83,7 @@ __kernel void
uint cols,
uint rows,
uint mstep
)
)
{
const uint x = get_global_id(0);
const uint y = get_global_id(1);
......
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