Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4

Conflicts: modules/features2d/src/orb.cpp
11 years ago · cc11a8d183
parent 54e65598bd f6f839eb3c
commit cc11a8d183
1 changed files with 4 additions and 0 deletions
--- 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