Merge pull request #111 from PhilLab/patch-1

Registration sample: adapt to xfeatures2d

Merge pull request #111 from PhilLab/patch-1
Registration sample: adapt to xfeatures2d
81623285 · Vadim Pisarevsky · 6a61e07c · 3218ba6c · 81623285
Commit 81623285 authored Oct 10, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

map_test.cpp modules/reg/samples/map_test.cpp +2 -1

No files found.
--- a/modules/reg/samples/map_test.cpp
+++ b/modules/reg/samples/map_test.cpp
@@ -47,9 +47,10 @@
 #include <opencv2/highgui/highgui_c.h>

 #ifdef COMPARE_FEATURES
-#include <opencv2/xfeatures2d/nonfree.hpp>
+#include <opencv2/xfeatures2d.hpp>
 #include <opencv2/calib3d.hpp>
 #include <opencv2/calib3d/calib3d_c.h>
+using namespace cv::xfeatures2d;
 #endif

 #include "opencv2/reg/mapaffine.hpp"