Remove patches applied upstream
IOhannes m zmölnig (Debian/GNU)
6 years ago
| 0 | Description: Include opencv2/imgproc.hpp for CV_RGB() | |
| 1 | Since OpenCV-3.4, we need to include opencv2/imgproc.hpp for CV_RGB() | |
| 2 | Author: Christoph Willing chris.willing@linux.com | |
| 3 | Origin: upstream | |
| 4 | Applied-Upstream: e1ecb144ca58cb4d68ef326d0ae224025a171fef | |
| 5 | Last-Update: 2019-09-12 | |
| 6 | --- | |
| 7 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
| 8 | --- frei0r.orig/src/filter/facebl0r/facebl0r.cpp | |
| 9 | +++ frei0r/src/filter/facebl0r/facebl0r.cpp | |
| 10 | @@ -14,11 +14,17 @@ | |
| 11 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 12 | */ | |
| 13 | ||
| 14 | - | |
| 15 | +#include <opencv2/core/version.hpp> | |
| 16 | +#define CV_VERSION_NUM (CV_VERSION_MAJOR * 10000 \ | |
| 17 | + + CV_VERSION_MINOR * 100 \ | |
| 18 | + + CV_VERSION_REVISION) | |
| 19 | #include <stdio.h> | |
| 20 | #include <stdlib.h> | |
| 21 | #include <opencv/cv.h> | |
| 22 | #include <opencv/highgui.h> | |
| 23 | +#if CV_VERSION_NUM > 30401 | |
| 24 | +# include <opencv2/imgproc.hpp> | |
| 25 | +#endif | |
| 26 | ||
| 27 | #include <frei0r.hpp> | |
| 28 | #include <frei0r_math.h> |