Commit c9b68915 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

fix compilation under MACOSX with OpenCV 2.3.0

parent 29e24a3e
......@@ -29,9 +29,9 @@
// To avoid broken compilation with OpenCV >= 2.0
#undef HAVE_CONFIG_H
#ifdef WIN32
#include <cv.h>
#include <highgui.h>
#if defined (__APPLE__)
#include <opencv2/opencv.hpp>
#include <opencv2/legacy/compat.hpp>
#else
#include <opencv/cv.h>
#include <opencv2/highgui/highgui_c.h>
......
......@@ -32,11 +32,12 @@
// OpenCV includes
#ifdef WIN32
#include <cv.h>
#if defined (__APPLE__)
#include <opencv2/opencv.hpp>
#include <opencv2/legacy/compat.hpp>
#else
#include <opencv/cv.h>
#endif // WIN32
#endif
namespace KIPIRemoveRedEyesPlugin
{
......
......@@ -30,8 +30,9 @@
// To avoid broken compilation with OpenCV >= 2.0
#undef HAVE_CONFIG_H
#ifdef WIN32
#include <cv.h>
#if defined (__APPLE__)
#include <opencv2/opencv.hpp>
#include <opencv2/legacy/compat.hpp>
#else
#include <opencv/cv.h>
#endif
......
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