potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source 
Conflicts:
	modules/features2d/src/orb.cpp
This commit is contained in:
Vadim Pisarevsky
2014-10-17 15:13:35 +04:00
parent 54e65598bd f6f839eb3c
commit cc11a8d183
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/orb.cpp
+4
View File
@@ -38,6 +38,10 @@
#include "opencl_kernels_features2d.hpp"
#include <iterator>
#ifndef CV_IMPL_ADD
#define CV_IMPL_ADD(x)
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
namespace cv