From 9d49d3ea4a33ad80f72d556f77b006a558b029d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 17 Jan 2019 17:02:43 +0200 Subject: [PATCH] opencv data path Gbp-Pq: Name 02_opencv-data-path.patch --- ext/opencv/gstfaceblur.cpp | 5 ++--- ext/opencv/gstfacedetect.cpp | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/opencv/gstfaceblur.cpp b/ext/opencv/gstfaceblur.cpp index 91bda2f..93671e4 100644 --- a/ext/opencv/gstfaceblur.cpp +++ b/ext/opencv/gstfaceblur.cpp @@ -68,9 +68,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_face_blur_debug); #define GST_CAT_DEFAULT gst_face_blur_debug -#define DEFAULT_PROFILE OPENCV_PREFIX G_DIR_SEPARATOR_S "share" \ - G_DIR_SEPARATOR_S OPENCV_PATH_NAME G_DIR_SEPARATOR_S "haarcascades" \ - G_DIR_SEPARATOR_S "haarcascade_frontalface_default.xml" +#define HAAR_CASCADES_DIR "/usr/share/opencv4/haarcascades/" +#define DEFAULT_PROFILE HAAR_CASCADES_DIR HAAR_CASCADES_DIR "haarcascade_frontalface_default.xml" #define DEFAULT_SCALE_FACTOR 1.25 #if (CV_MAJOR_VERSION >= 4) #define DEFAULT_FLAGS CASCADE_DO_CANNY_PRUNING diff --git a/ext/opencv/gstfacedetect.cpp b/ext/opencv/gstfacedetect.cpp index 5e1c781..59e1d0a 100644 --- a/ext/opencv/gstfacedetect.cpp +++ b/ext/opencv/gstfacedetect.cpp @@ -86,9 +86,7 @@ using namespace std; GST_DEBUG_CATEGORY_STATIC (gst_face_detect_debug); #define GST_CAT_DEFAULT gst_face_detect_debug -#define HAAR_CASCADES_DIR OPENCV_PREFIX G_DIR_SEPARATOR_S "share" \ - G_DIR_SEPARATOR_S OPENCV_PATH_NAME G_DIR_SEPARATOR_S "haarcascades" \ - G_DIR_SEPARATOR_S +#define HAAR_CASCADES_DIR "/usr/share/opencv4/haarcascades/" #define DEFAULT_FACE_PROFILE HAAR_CASCADES_DIR "haarcascade_frontalface_default.xml" #define DEFAULT_NOSE_PROFILE HAAR_CASCADES_DIR "haarcascade_mcs_nose.xml" #define DEFAULT_MOUTH_PROFILE HAAR_CASCADES_DIR "haarcascade_mcs_mouth.xml" -- 2.30.2