Skip to content
Snippets Groups Projects
Commit d96ee8b6 authored by Angel Santamaria-Navarro's avatar Angel Santamaria-Navarro
Browse files

Modify headers depending on OpenCV major version

parent 39410ab1
No related branches found
No related tags found
1 merge request!128Updates for OpenCV 3 api (keeping OpenCV 2 back compatibility)
......@@ -11,19 +11,22 @@
#include "constraint_epipolar.h"
#include "processor_image_params.h"
// OpenCV includes
#include "opencv2/features2d/features2d.hpp"
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core/core.hpp>
#if defined (HAVE_OPENCV3)
#include <opencv2/features2d.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#else
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core/core.hpp>
#endif
// General includes
#include <cmath>
#include <complex> // std::complex, std::norm
namespace wolf {
WOLF_PTR_TYPEDEFS(ProcessorImageFeature);
......
......@@ -14,10 +14,16 @@
#include "constraint_AHP.h"
// OpenCV includes
#include "opencv2/features2d/features2d.hpp"
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core/core.hpp>
#if defined (HAVE_OPENCV3)
#include <opencv2/features2d.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#else
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core/core.hpp>
#endif
// General includes
#include <cmath>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment