diff --git a/include/find_object/QtOpenCV.h b/include/find_object/QtOpenCV.h index 488b5015..3faacc0d 100644 --- a/include/find_object/QtOpenCV.h +++ b/include/find_object/QtOpenCV.h @@ -41,11 +41,13 @@ FINDOBJECT_EXP QImage cvtCvMat2QImage(const cv::Mat & image, bool isBgr = true); // Convert QImage to OpenCV matrix FINDOBJECT_EXP cv::Mat cvtQImage2CvMat(const QImage & image); +#if CV_MAJOR_VERSION < 3 // Convert IplImage to QImage FINDOBJECT_EXP QImage cvtIplImage2QImage(const IplImage * image); // Convert QImage to IplImage FINDOBJECT_EXP IplImage * cvtQImage2IplImage(const QImage & image); +#endif } // namespace find_object diff --git a/src/QtOpenCV.cpp b/src/QtOpenCV.cpp index c07b22c7..e5bd205f 100644 --- a/src/QtOpenCV.cpp +++ b/src/QtOpenCV.cpp @@ -102,7 +102,7 @@ cv::Mat cvtQImage2CvMat(const QImage & image) return cvImage; } - +#if CV_MAJOR_VERSION < 3 QImage cvtIplImage2QImage(const IplImage * image) { QImage qtemp; @@ -154,5 +154,6 @@ IplImage * cvtQImage2IplImage(const QImage & image) } return iplTmp; } +#endif } // namespace find_object