diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-05-23 07:44:24 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-05-23 07:44:24 +0200 |
| commit | beb8b0dad71871aa66b63901b3e6b6c047e1a646 (patch) | |
| tree | f96b49e7dabca98306db6cf716592c62adcc9b77 /facedetect | |
| parent | 2861a48339aa0756131008dfaf399426c97de34b (diff) | |
| parent | 08f04632f65e109dae9bd554621e33454adacf41 (diff) | |
Merge branch 'release/debian/0.30.16-1'debian/0.30.16-1
Diffstat (limited to 'facedetect')
| -rw-r--r-- | facedetect/meson.build | 5 | ||||
| -rw-r--r-- | facedetect/shotwell-facedetect.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/facedetect/meson.build b/facedetect/meson.build index 6724abc..bd5f3c3 100644 --- a/facedetect/meson.build +++ b/facedetect/meson.build @@ -1,6 +1,9 @@ subproject = ('facedetect') add_languages('cpp') -facedetect_dep = dependency('opencv', version : ['>= 2.3.0'], required : true) +facedetect_dep = dependency('opencv4', version : ['>= 4.0.0'], required : false) +if not facedetect_dep.found() + facedetect_dep = dependency('opencv', version : ['>= 3.4.0'], required : true) +endif executable('shotwell-facedetect', 'shotwell-facedetect.cpp', dependencies : facedetect_dep, diff --git a/facedetect/shotwell-facedetect.cpp b/facedetect/shotwell-facedetect.cpp index 1b09379..1c10580 100644 --- a/facedetect/shotwell-facedetect.cpp +++ b/facedetect/shotwell-facedetect.cpp @@ -34,7 +34,7 @@ void help() { void detectFaces(Mat &img, CascadeClassifier &cascade, double scale) { Mat gray; - cvtColor(img, gray, CV_BGR2GRAY); + cvtColor(img, gray, cv::COLOR_BGR2GRAY); Mat smallImg(cvRound(img.rows / scale), cvRound(img.cols / scale), CV_8UC1); Size smallImgSize = smallImg.size(); @@ -43,7 +43,7 @@ void detectFaces(Mat &img, CascadeClassifier &cascade, double scale) { equalizeHist(smallImg, smallImg); vector<Rect> faces; - cascade.detectMultiScale(smallImg, faces, 1.1, 2, CV_HAAR_SCALE_IMAGE, Size(30, 30)); + cascade.detectMultiScale(smallImg, faces, 1.1, 2, cv::CASCADE_SCALE_IMAGE, Size(30, 30)); int i = 0; for (vector<Rect>::const_iterator r = faces.begin(); r != faces.end(); r++, i++) { @@ -117,7 +117,7 @@ int main(int argc, const char** argv) { } - Mat image = imread(inputName, 1); + Mat image = cv::imread(inputName, 1); if (image.empty()) { |