Commit f6f839eb authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

trying to resolve the merge conflict

parent c5292c25
...@@ -38,6 +38,10 @@ ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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 )
......
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