apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed IplImage when using OpenCV3 (issue #3)

Browse Source
This commit is contained in:
matlabbe 2015-07-07 11:09:03 -04:00
parent bb097b2bab
commit a4a9b8ca5f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/find_object/QtOpenCV.h
View File

@ -41,11 +41,13 @@ FINDOBJECT_EXP QImage cvtCvMat2QImage(const cv::Mat & image, bool isBgr = true);
// Convert QImage to OpenCV matrix // Convert QImage to OpenCV matrix
FINDOBJECT_EXP cv::Mat cvtQImage2CvMat(const QImage & image); FINDOBJECT_EXP cv::Mat cvtQImage2CvMat(const QImage & image);
#if CV_MAJOR_VERSION < 3
// Convert IplImage to QImage // Convert IplImage to QImage
FINDOBJECT_EXP QImage cvtIplImage2QImage(const IplImage * image); FINDOBJECT_EXP QImage cvtIplImage2QImage(const IplImage * image);
// Convert QImage to IplImage // Convert QImage to IplImage
FINDOBJECT_EXP IplImage * cvtQImage2IplImage(const QImage & image); FINDOBJECT_EXP IplImage * cvtQImage2IplImage(const QImage & image);
#endif
} // namespace find_object } // namespace find_object

3
src/QtOpenCV.cpp
View File

@ -102,7 +102,7 @@ cv::Mat cvtQImage2CvMat(const QImage & image)
return cvImage; return cvImage;
} }
#if CV_MAJOR_VERSION < 3
QImage cvtIplImage2QImage(const IplImage * image) QImage cvtIplImage2QImage(const IplImage * image)
{ {
QImage qtemp; QImage qtemp;
@ -154,5 +154,6 @@ IplImage * cvtQImage2IplImage(const QImage & image)
} }
return iplTmp; return iplTmp;
} }
#endif
} // namespace find_object } // namespace find_object