diff --git a/src/processor_image_feature.h b/src/processor_image_feature.h index ac1e5786d4c7961cbbf41db32633b5bf2e7866f7..69f1444f365aa0f9cab8a015bec044c1b290b0ff 100644 --- a/src/processor_image_feature.h +++ b/src/processor_image_feature.h @@ -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); diff --git a/src/processor_image_landmark.h b/src/processor_image_landmark.h index dced57e4528ae303a6a7a7b637a3c140e7d61375..91c1e88516112d43bc0df3cfce21e9e6eee8c1e7 100644 --- a/src/processor_image_landmark.h +++ b/src/processor_image_landmark.h @@ -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>