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

trying to resolve the merge conflict

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-10-17 14:46:08 +04:00
parent c5292c2549
commit f6f839eb3c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/features2d/src/orb.cpp
View File

@@ -38,6 +38,10 @@
#include "opencl_kernels_features2d.hpp" #include "opencl_kernels_features2d.hpp"
#include <iterator> #include <iterator>
#ifndef CV_IMPL_ADD
#define CV_IMPL_ADD(x)
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
namespace cv namespace cv
@@ -888,6 +892,7 @@ static void computeKeyPoints(const Mat& imagePyramid,
uresponses, nkeypoints, 7, HARRIS_K ); uresponses, nkeypoints, 7, HARRIS_K );
if( useOCL ) if( useOCL )
{ {
CV_IMPL_ADD(CV_IMPL_OCL);
uresponses.copyTo(responses); uresponses.copyTo(responses);
for( i = 0; i < nkeypoints; i++ ) for( i = 0; i < nkeypoints; i++ )
allKeypoints[i].response = responses.at<float>(i); allKeypoints[i].response = responses.at<float>(i);
@@ -932,6 +937,7 @@ static void computeKeyPoints(const Mat& imagePyramid,
if( useOCL ) if( useOCL )
{ {
CV_IMPL_ADD(CV_IMPL_OCL);
uresponses.copyTo(responses); uresponses.copyTo(responses);
for( i = 0; i < nkeypoints; i++ ) for( i = 0; i < nkeypoints; i++ )
allKeypoints[i].angle = responses.at<float>(i); allKeypoints[i].angle = responses.at<float>(i);
@@ -1176,6 +1182,10 @@ void ORB_Impl::detectAndCompute( InputArray _image, InputArray _mask,
useOCL = ocl_computeOrbDescriptors(uimagePyramid, ulayerInfo, useOCL = ocl_computeOrbDescriptors(uimagePyramid, ulayerInfo,
ukeypoints, udescriptors, upattern, ukeypoints, udescriptors, upattern,
nkeypoints, dsize, wta_k); nkeypoints, dsize, wta_k);
if(useOCL)
{
CV_IMPL_ADD(CV_IMPL_OCL);
}
} }
if( !useOCL ) if( !useOCL )