From 2045c85ad56e819bb81e2da46430a0196bf053c0 Mon Sep 17 00:00:00 2001 From: NikoKJ Date: Wed, 31 Oct 2012 16:01:56 +0800 Subject: [PATCH] a minor bug fix for brute force --- modules/ocl/src/brute_force_matcher.cpp | 4 ++-- modules/ocl/src/initialization.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/ocl/src/brute_force_matcher.cpp b/modules/ocl/src/brute_force_matcher.cpp index d2122bb6b..20c9ebf57 100644 --- a/modules/ocl/src/brute_force_matcher.cpp +++ b/modules/ocl/src/brute_force_matcher.cpp @@ -300,7 +300,7 @@ void matchUnrolledCached(const oclMat &query, const oclMat &train, float maxDist args.push_back( make_pair( sizeof(cl_int), (void *)&query.cols )); args.push_back( make_pair( sizeof(cl_int), (void *)&train.rows )); args.push_back( make_pair( sizeof(cl_int), (void *)&train.cols )); - args.push_back( make_pair( sizeof(cl_mem), (void *)&trainIdx.cols )); + args.push_back( make_pair( sizeof(cl_int), (void *)&trainIdx.cols )); args.push_back( make_pair( sizeof(cl_int), (void *)&query.step )); args.push_back( make_pair( sizeof(cl_int), (void *)&trainIdx.step )); args.push_back( make_pair( sizeof(cl_int), (void *)&distType )); @@ -338,7 +338,7 @@ void radius_match(const oclMat &query, const oclMat &train, float maxDistance, c args.push_back( make_pair( sizeof(cl_int), (void *)&query.cols )); args.push_back( make_pair( sizeof(cl_int), (void *)&train.rows )); args.push_back( make_pair( sizeof(cl_int), (void *)&train.cols )); - args.push_back( make_pair( sizeof(cl_mem), (void *)&trainIdx.cols )); + args.push_back( make_pair( sizeof(cl_int), (void *)&trainIdx.cols )); args.push_back( make_pair( sizeof(cl_int), (void *)&query.step )); args.push_back( make_pair( sizeof(cl_int), (void *)&trainIdx.step )); args.push_back( make_pair( sizeof(cl_int), (void *)&distType )); diff --git a/modules/ocl/src/initialization.cpp b/modules/ocl/src/initialization.cpp index ebc202858..a8814c72d 100644 --- a/modules/ocl/src/initialization.cpp +++ b/modules/ocl/src/initialization.cpp @@ -338,7 +338,8 @@ namespace cv EXT_LEN, (void *)extends_set, &extends_size)); CV_Assert(extends_size < EXT_LEN); extends_set[EXT_LEN - 1] = 0; - //oclinfo.extra_options = NULL; + memset(oclinfo.impl->extra_options, 0, 512); + oclinfo.impl->double_support = 0; int fp64_khr = string(extends_set).find("cl_khr_fp64"); if(fp64_khr >= 0 && fp64_khr < EXT_LEN)