From f6f839eb3c37a6d676910d98ecf196d16d609e58 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Fri, 17 Oct 2014 14:46:08 +0400
Subject: [PATCH] trying to resolve the merge conflict

---
 modules/features2d/src/orb.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/features2d/src/orb.cpp b/modules/features2d/src/orb.cpp
index 3a9a2e9..3007309 100644
--- a/modules/features2d/src/orb.cpp
+++ b/modules/features2d/src/orb.cpp
@@ -38,6 +38,10 @@
 #include "opencl_kernels_features2d.hpp"
 #include <iterator>
 
+#ifndef CV_IMPL_ADD
+#define CV_IMPL_ADD(x)
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace cv
@@ -888,6 +892,7 @@ static void computeKeyPoints(const Mat& imagePyramid,
                                           uresponses, nkeypoints, 7, HARRIS_K );
             if( useOCL )
             {
+                CV_IMPL_ADD(CV_IMPL_OCL);
                 uresponses.copyTo(responses);
                 for( i = 0; i < nkeypoints; i++ )
                     allKeypoints[i].response = responses.at<float>(i);
@@ -932,6 +937,7 @@ static void computeKeyPoints(const Mat& imagePyramid,
 
         if( useOCL )
         {
+            CV_IMPL_ADD(CV_IMPL_OCL);
             uresponses.copyTo(responses);
             for( i = 0; i < nkeypoints; 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,
                                                ukeypoints, udescriptors, upattern,
                                                nkeypoints, dsize, wta_k);
+            if(useOCL)
+            {
+                CV_IMPL_ADD(CV_IMPL_OCL);
+            }
         }
 
         if( !useOCL )
-- 
2.7.4