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

fixed some more compile errors

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-11-18 14:26:19 -05:00
parent e2bbe7597b
commit 241002384c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/src/color.cpp
View File

@ -2693,7 +2693,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
bool ok = true;
UMat src = _src.getUMat(), dst;
Size sz = src.size(), dstSz = sz;
int scn = src.channels(), depth = src.depth(), bidx, dtype;
int scn = src.channels(), depth = src.depth(), bidx;
size_t globalsize[] = { src.cols, src.rows };
ocl::Kernel k;
@ -2717,7 +2717,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
{
CV_Assert(scn == 3 || scn == 4);
bidx = code == COLOR_BGR2GRAY || code == COLOR_BGRA2GRAY ? 0 : 2;
dtype = depth;
dcn = 1;
k.create("RGB2Gray", ocl::imgproc::cvtcolor_oclsrc,
format("-D depth=%d -D scn=%d -D dcn=1 -D bidx=%d", depth, scn, bidx));
break;
@ -2727,7 +2727,6 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
{
CV_Assert(scn == 1);
dcn = code == COLOR_GRAY2BGRA ? 4 : 3;
dtype = CV_MAKETYPE(depth, dcn);
k.create("Gray2RGB", ocl::imgproc::cvtcolor_oclsrc,
format("-D depth=%d -D scn=1 -D dcn=%d", depth, dcn));
break;
@ -2737,6 +2736,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
{
CV_Assert(scn == 3 || scn == 4);
bidx = code == COLOR_RGB2YUV ? 0 : 2;
dcn = 3;
k.create("RGB2YUV", ocl::imgproc::cvtcolor_oclsrc,
format("-D depth=%d -D scn=%d -D dcn=3 -D bidx=%d", depth, scn, bidx));
break;
@ -2773,6 +2773,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
{
CV_Assert(scn == 3 || scn == 4);
bidx = code == COLOR_BGR2YCrCb ? 0 : 2;
dcn = 3;
k.create("RGB2YCrCb", ocl::imgproc::cvtcolor_oclsrc,
format("-D depth=%d -D scn=%d -D dcn=3 -D bidx=%d", depth, scn, bidx));
break;
@ -2797,7 +2798,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if( !k.empty() )
{
_dst.create(dstSz, dtype);
_dst.create(dstSz, CV_MAKETYPE(depth, dcn));
dst = _dst.getUMat();
k.args(ocl::KernelArg::ReadOnlyNoSize(src), ocl::KernelArg::WriteOnly(dst));
ok = k.run(2, globalsize, 0, false);

11
samples/ocl/facedetect.cpp
View File

@ -139,9 +139,9 @@ int main( int argc, const char** argv )
work_end = 0;
if(useCPU)
detectCPU(frameCopy, faces, cpu_cascade, 1, false);
detectCPU(frameCopy, faces, cpu_cascade, 1);
else
detect(frameCopy, faces, cascade, 1, false);
detect(frameCopy, faces, cascade, 1);
Draw(frameCopy, faces, 1);
if( waitKey( 10 ) >= 0 )
@ -155,18 +155,19 @@ int main( int argc, const char** argv )
vector<Rect> faces;
vector<Rect> ref_rst;
double accuracy = 0.;
detectCPU(image, ref_rst, cpu_cascade, scale);
work_end = 0;
for(int i = 0; i <= LOOP_NUM; i ++)
{
cout << "loop" << i << endl;
if(useCPU)
detectCPU(image, faces, cpu_cascade, scale, i==0?false:true);
detectCPU(image, faces, cpu_cascade, scale);
else
{
detect(image, faces, cascade, scale, i==0?false:true);
detect(image, faces, cascade, scale);
if(i == 0)
{
detectCPU(image, ref_rst, cpu_cascade, scale, false);
accuracy = checkRectSimilarity(image.size(), ref_rst, faces);
}
}