Skip to content

O
opencv
Commit ba5d480f authored by Elena Gvozdeva's avatar Elena Gvozdeva
Browse files
Options

Fixed warnings

parent 86636dc2
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 96 deletions
modules/imgproc/src/opencl/match_template.cl
View file @ ba5d480f
...@@ -404,24 +404,4 @@ __kernel void matchTemplate_CCOEFF_NORMED_C4 (__global const uchar * img_sums, i ...@@ -404,24 +404,4 @@ __kernel void matchTemplate_CCOEFF_NORMED_C4 (__global const uchar * img_sums, i
__global float * result = (__global float *)(res)+res_idx; __global float * result = (__global float *)(res)+res_idx;
*result = normAcc((*result) - num, denum); *result = normAcc((*result) - num, denum);
} }
}
//////////////////////////////////////////// extractFirstChannel/////////////////////////////
__kernel void extractFirstChannel( const __global float4* img, int img_step, int img_offset,
__global float* res, int res_step, int res_offset, int rows, int cols)
{
img_step /= sizeof(float4);
img_offset /= sizeof(float4);
res_step /= sizeof(float);
res_offset /= sizeof(float);
int gidx = get_global_id(0);
int gidy = get_global_id(1);
if(gidx < cols && gidy < rows)
{
__global const float4 * image = (__global const float4 *)(img) + mad24(gidy, img_step, img_offset + gidx);
__global float * result = (__global float *)(res)+ mad24(gidy, res_step, res_offset + gidx);
*result = image[0].x;
}
} }
\ No newline at end of file
modules/imgproc/src/templmatch.cpp
View file @ ba5d480f
...@@ -45,22 +45,14 @@ ...@@ -45,22 +45,14 @@
//////////////////////////////////////////////////matchTemplate////////////////////////////////////////////////////////// //////////////////////////////////////////////////matchTemplate//////////////////////////////////////////////////////////
namespace cv namespace cv
{ {
struct MatchTemplateBuf static bool matchTemplate_CCORR(const UMat &image, const UMat &templ, UMat &result);
{ static bool matchTemplate_CCORR_NORMED(const UMat &image, const UMat &templ, UMat &result);
Size user_block_size;
UMat imagef, templf;
UMat image_sums;
UMat image_sqsums;
};
static bool matchTemplate_CCORR(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf);
static bool matchTemplate_CCORR_NORMED(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf);
static bool matchTemplate_SQDIFF(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf); static bool matchTemplate_SQDIFF(const UMat &image, const UMat &templ, UMat &result);
static bool matchTemplate_SQDIFF_NORMED (const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf); static bool matchTemplate_SQDIFF_NORMED (const UMat &image, const UMat &templ, UMat &result);
static bool matchTemplate_CCOEFF(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf); static bool matchTemplate_CCOEFF(const UMat &image, const UMat &templ, UMat &result);
static bool matchTemplate_CCOEFF_NORMED(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf); static bool matchTemplate_CCOEFF_NORMED(const UMat &image, const UMat &templ, UMat &result);
static bool matchTemplateNaive_CCORR (const UMat &image, const UMat &templ, UMat &result, int cn); static bool matchTemplateNaive_CCORR (const UMat &image, const UMat &templ, UMat &result, int cn);
static bool matchTemplateNaive_SQDIFF(const UMat &image, const UMat &templ, UMat &result, int cn); static bool matchTemplateNaive_SQDIFF(const UMat &image, const UMat &templ, UMat &result, int cn);
...@@ -84,24 +76,7 @@ namespace cv ...@@ -84,24 +76,7 @@ namespace cv
///////////////////////////////////////////////////CCORR////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////CCORR//////////////////////////////////////////////////////////////
static bool extractFirstChannel_32F(const UMat &image, UMat &result) static bool matchTemplate_CCORR(const UMat &image, const UMat &templ, UMat &result)
{
const char * kernelName = "extractFirstChannel";
int type = image.type();
int depth = CV_MAT_DEPTH(type);
int cn = CV_MAT_CN(type);
ocl::Kernel k (kernelName, ocl::imgproc::match_template_oclsrc, format("-D type=%s -D elem_type=%s -D cn=%d",ocl::typeToStr(type), ocl::typeToStr(depth), cn));
if (k.empty())
return false;
size_t globalsize[2] = {result.cols, result.rows};
size_t localsize[2] = {16, 16};
return k.args(ocl::KernelArg::ReadOnlyNoSize(image), ocl::KernelArg::WriteOnly(result)).run(2,globalsize,localsize,true);
}
static bool matchTemplate_CCORR(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf)
{ {
if (useNaive(TM_CCORR, image.depth(), templ.size()) ) if (useNaive(TM_CCORR, image.depth(), templ.size()) )
return matchTemplateNaive_CCORR(image, templ, result, image.channels()); return matchTemplateNaive_CCORR(image, templ, result, image.channels());
...@@ -128,9 +103,9 @@ namespace cv ...@@ -128,9 +103,9 @@ namespace cv
return k.args(ocl::KernelArg::ReadOnlyNoSize(image), ocl::KernelArg::ReadOnly(templ), ocl::KernelArg::WriteOnly(result)).run(2,globalsize,localsize,true); return k.args(ocl::KernelArg::ReadOnlyNoSize(image), ocl::KernelArg::ReadOnly(templ), ocl::KernelArg::WriteOnly(result)).run(2,globalsize,localsize,true);
} }
static bool matchTemplate_CCORR_NORMED(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf) static bool matchTemplate_CCORR_NORMED(const UMat &image, const UMat &templ, UMat &result)
{ {
if (!matchTemplate_CCORR(image, templ, result, buf)) if (!matchTemplate_CCORR(image, templ, result))
return false; return false;
int type = image.type(); int type = image.type();
...@@ -142,13 +117,13 @@ namespace cv ...@@ -142,13 +117,13 @@ namespace cv
if (k.empty()) if (k.empty())
return false; return false;
UMat temp; UMat temp, image_sums, image_sqsums;
integral(image.reshape(1), buf.image_sums, temp); integral(image.reshape(1), image_sums, temp);
if(temp.depth() == CV_64F) if(temp.depth() == CV_64F)
temp.convertTo(buf.image_sqsums, CV_32F); temp.convertTo(image_sqsums, CV_32F);
else else
buf.image_sqsums = temp; image_sqsums = temp;
UMat templ_resh; UMat templ_resh;
templ.reshape(1).convertTo(templ_resh, CV_32F); templ.reshape(1).convertTo(templ_resh, CV_32F);
...@@ -159,12 +134,12 @@ namespace cv ...@@ -159,12 +134,12 @@ namespace cv
size_t globalsize[2] = {result.cols, result.rows}; size_t globalsize[2] = {result.cols, result.rows};
size_t localsize[2] = {16, 16}; size_t localsize[2] = {16, 16};
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sqsums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sqsum).run(2,globalsize,localsize,true); return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sqsums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sqsum).run(2,globalsize,localsize,true);
} }
//////////////////////////////////////SQDIFF////////////////////////////////////////////////////////////// //////////////////////////////////////SQDIFF//////////////////////////////////////////////////////////////
static bool matchTemplate_SQDIFF(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf) static bool matchTemplate_SQDIFF(const UMat &image, const UMat &templ, UMat &result)
{ {
if (useNaive(TM_SQDIFF, image.depth(), templ.size())) if (useNaive(TM_SQDIFF, image.depth(), templ.size()))
{ {
...@@ -193,9 +168,9 @@ namespace cv ...@@ -193,9 +168,9 @@ namespace cv
return k.args(ocl::KernelArg::ReadOnlyNoSize(image), ocl::KernelArg::ReadOnly(templ), ocl::KernelArg::WriteOnly(result)).run(2,globalsize,localsize,true); return k.args(ocl::KernelArg::ReadOnlyNoSize(image), ocl::KernelArg::ReadOnly(templ), ocl::KernelArg::WriteOnly(result)).run(2,globalsize,localsize,true);
} }
static bool matchTemplate_SQDIFF_NORMED (const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf) static bool matchTemplate_SQDIFF_NORMED (const UMat &image, const UMat &templ, UMat &result)
{ {
if (!matchTemplate_CCORR(image, templ, result, buf)) if (!matchTemplate_CCORR(image, templ, result))
return false; return false;
int type = image.type(); int type = image.type();
...@@ -207,13 +182,13 @@ namespace cv ...@@ -207,13 +182,13 @@ namespace cv
if (k.empty()) if (k.empty())
return false; return false;
UMat temp; UMat temp, image_sums, image_sqsums;
integral(image.reshape(1), buf.image_sums, temp); integral(image.reshape(1), image_sums, temp);
if(temp.depth() == CV_64F) if(temp.depth() == CV_64F)
temp.convertTo(buf.image_sqsums, CV_32F); temp.convertTo(image_sqsums, CV_32F);
else else
buf.image_sqsums = temp; image_sqsums = temp;
UMat templ_resh; UMat templ_resh;
templ.reshape(1).convertTo(templ_resh, CV_32F); templ.reshape(1).convertTo(templ_resh, CV_32F);
...@@ -224,19 +199,20 @@ namespace cv ...@@ -224,19 +199,20 @@ namespace cv
size_t globalsize[2] = {result.cols, result.rows}; size_t globalsize[2] = {result.cols, result.rows};
size_t localsize[2] = {16, 16}; size_t localsize[2] = {16, 16};
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sqsums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sqsum).run(2,globalsize,localsize,true); return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sqsums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sqsum).run(2,globalsize,localsize,true);
} }
/////////////////////////////////////CCOEFF///////////////////////////////////////////////////////////////// /////////////////////////////////////CCOEFF/////////////////////////////////////////////////////////////////
static bool matchTemplate_CCOEFF(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf) static bool matchTemplate_CCOEFF(const UMat &image, const UMat &templ, UMat &result)
{ {
if (!matchTemplate_CCORR(image, templ, result, buf)) if (!matchTemplate_CCORR(image, templ, result))
return false; return false;
integral(image, buf.image_sums); UMat image_sums;
integral(image, image_sums);
int type = buf.image_sums.type(); int type = image_sums.type();
int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type); int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
const char * kernelName; const char * kernelName;
...@@ -258,35 +234,36 @@ namespace cv ...@@ -258,35 +234,36 @@ namespace cv
if (cn==1) if (cn==1)
{ {
float templ_sum = (float)sum(templ)[0]/ templ.size().area(); float templ_sum = (float)sum(templ)[0]/ templ.size().area();
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sum).run(2,globalsize,localsize,true); return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, templ_sum).run(2,globalsize,localsize,true);
} }
else else
{ {
Vec4f templ_sum = Vec4f::all(0); Vec4f templ_sum = Vec4f::all(0);
templ_sum = sum(templ)/ templ.size().area(); templ_sum = sum(templ)/ templ.size().area();
if (cn==2) if (cn==2)
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols,
templ_sum[0],templ_sum[1]).run(2,globalsize,localsize,true); templ_sum[0],templ_sum[1]).run(2,globalsize,localsize,true);
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums), ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols,
templ_sum[0],templ_sum[1],templ_sum[2],templ_sum[3]).run(2,globalsize,localsize,true); templ_sum[0],templ_sum[1],templ_sum[2],templ_sum[3]).run(2,globalsize,localsize,true);
} }
} }
static bool matchTemplate_CCOEFF_NORMED(const UMat &image, const UMat &templ, UMat &result, MatchTemplateBuf &buf) static bool matchTemplate_CCOEFF_NORMED(const UMat &image, const UMat &templ, UMat &result)
{ {
image.convertTo(buf.imagef, CV_32F); UMat imagef, templf;
templ.convertTo(buf.templf, CV_32F); image.convertTo(imagef, CV_32F);
templ.convertTo(templf, CV_32F);
if(!matchTemplate_CCORR(buf.imagef, buf.templf, result, buf)) if(!matchTemplate_CCORR(imagef, templf, result))
return false; return false;
const char * kernelName; const char * kernelName;
UMat temp; UMat temp, image_sums, image_sqsums;
integral(image, buf.image_sums, temp); integral(image,image_sums, temp);
int type = buf.image_sums.type(); int type = image_sums.type();
int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type); int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
if (cn== 1) if (cn== 1)
...@@ -302,9 +279,9 @@ namespace cv ...@@ -302,9 +279,9 @@ namespace cv
return false; return false;
if(temp.depth() == CV_64F) if(temp.depth() == CV_64F)
temp.convertTo(buf.image_sqsums, CV_32F); temp.convertTo(image_sqsums, CV_32F);
else else
buf.image_sqsums = temp; image_sqsums = temp;
size_t globalsize[2] = {result.cols, result.rows}; size_t globalsize[2] = {result.cols, result.rows};
size_t localsize[2] = {16, 16}; size_t localsize[2] = {16, 16};
...@@ -315,7 +292,7 @@ namespace cv ...@@ -315,7 +292,7 @@ namespace cv
{ {
float templ_sum = (float)sum(templ)[0]; float templ_sum = (float)sum(templ)[0];
multiply(buf.templf, buf.templf, temp); multiply(templf, templf, temp);
float templ_sqsum = (float)sum(temp)[0]; float templ_sqsum = (float)sum(temp)[0];
templ_sqsum -= scale * templ_sum * templ_sum; templ_sqsum -= scale * templ_sum * templ_sum;
...@@ -327,7 +304,7 @@ namespace cv ...@@ -327,7 +304,7 @@ namespace cv
return true; return true;
} }
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums),ocl::KernelArg::ReadOnlyNoSize(buf.image_sqsums), return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums),ocl::KernelArg::ReadOnlyNoSize(image_sqsums),
ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale, templ_sum, templ_sqsum) ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale, templ_sum, templ_sqsum)
.run(2,globalsize,localsize,true); .run(2,globalsize,localsize,true);
} }
...@@ -338,7 +315,7 @@ namespace cv ...@@ -338,7 +315,7 @@ namespace cv
templ_sum = sum(templ); templ_sum = sum(templ);
multiply(buf.templf, buf.templf, temp); multiply(templf, templf, temp);
templ_sqsum = sum(temp); templ_sqsum = sum(temp);
float templ_sqsum_sum = 0; float templ_sqsum_sum = 0;
...@@ -356,12 +333,12 @@ namespace cv ...@@ -356,12 +333,12 @@ namespace cv
} }
if (cn==2) if (cn==2)
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums), ocl::KernelArg::ReadOnlyNoSize(buf.image_sqsums), return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums), ocl::KernelArg::ReadOnlyNoSize(image_sqsums),
ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale, ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale,
templ_sum[0],templ_sum[1], templ_sqsum_sum) templ_sum[0],templ_sum[1], templ_sqsum_sum)
.run(2,globalsize,localsize,true); .run(2,globalsize,localsize,true);
return k.args(ocl::KernelArg::ReadOnlyNoSize(buf.image_sums), ocl::KernelArg::ReadOnlyNoSize(buf.image_sqsums), return k.args(ocl::KernelArg::ReadOnlyNoSize(image_sums), ocl::KernelArg::ReadOnlyNoSize(image_sqsums),
ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale, ocl::KernelArg::WriteOnly(result), templ.rows, templ.cols, scale,
templ_sum[0],templ_sum[1],templ_sum[2],templ_sum[3], templ_sqsum_sum) templ_sum[0],templ_sum[1],templ_sum[2],templ_sum[3], templ_sqsum_sum)
.run(2,globalsize,localsize,true); .run(2,globalsize,localsize,true);
...@@ -378,7 +355,7 @@ namespace cv ...@@ -378,7 +355,7 @@ namespace cv
CV_Assert( cn == _templ.channels() && cn!=3 && cn<=4); CV_Assert( cn == _templ.channels() && cn!=3 && cn<=4);
typedef bool (*Caller)(const UMat &, const UMat &, UMat &, MatchTemplateBuf &); typedef bool (*Caller)(const UMat &, const UMat &, UMat &);
const Caller callers[] = const Caller callers[] =
{ {
...@@ -386,17 +363,13 @@ namespace cv ...@@ -386,17 +363,13 @@ namespace cv
matchTemplate_CCORR_NORMED, matchTemplate_CCOEFF, matchTemplate_CCOEFF_NORMED matchTemplate_CCORR_NORMED, matchTemplate_CCOEFF, matchTemplate_CCOEFF_NORMED
}; };
Caller caller; Caller caller = callers[method];
if (!(caller = callers[method]))
return false;
MatchTemplateBuf buf;
UMat image = _img.getUMat(); UMat image = _img.getUMat();
UMat templ = _templ.getUMat(), result; UMat templ = _templ.getUMat(), result;
_result.create(image.rows - templ.rows + 1, image.cols - templ.cols + 1, CV_32F); _result.create(image.rows - templ.rows + 1, image.cols - templ.cols + 1, CV_32F);
result = _result.getUMat(); result = _result.getUMat();
return caller(image, templ, result, buf); return caller(image, templ, result);
} }
} }
......
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