Commit 81623285 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #111 from PhilLab/patch-1

Registration sample: adapt to xfeatures2d
parents 6a61e07c 3218ba6c
...@@ -47,9 +47,10 @@ ...@@ -47,9 +47,10 @@
#include <opencv2/highgui/highgui_c.h> #include <opencv2/highgui/highgui_c.h>
#ifdef COMPARE_FEATURES #ifdef COMPARE_FEATURES
#include <opencv2/xfeatures2d/nonfree.hpp> #include <opencv2/xfeatures2d.hpp>
#include <opencv2/calib3d.hpp> #include <opencv2/calib3d.hpp>
#include <opencv2/calib3d/calib3d_c.h> #include <opencv2/calib3d/calib3d_c.h>
using namespace cv::xfeatures2d;
#endif #endif
#include "opencv2/reg/mapaffine.hpp" #include "opencv2/reg/mapaffine.hpp"
......
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