[shotwell: 2/2] Merge branch 'wip/faces' into 'master'
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell: 2/2] Merge branch 'wip/faces' into 'master'
- Date: Tue, 19 Feb 2019 14:43:29 +0000 (UTC)
commit 6f66b6e3568872e4246febe57f2915f75d7a5d43
Merge: 8d5e870d 56acbed6
Author: Jens Georg <mail jensge org>
Date: Tue Feb 19 14:43:00 2019 +0000
Merge branch 'wip/faces' into 'master'
Enhancements to face detection, especially face recognition
See merge request GNOME/shotwell!11
.gitignore | 84 ++
facedetect/meson.build | 10 -
facedetect/shotwell-facedetect.cpp | 134 ---
flatpak/org.gnome.Shotwell.Faces.json | 97 ++
flatpak/org.gnome.Shotwell.json | 3 +-
meson.build | 4 +-
meson_options.txt | 1 +
src/AppDirs.vala | 8 +-
src/AppWindow.vala | 2 +-
src/Commands.vala | 42 +-
src/Photo.vala | 2 +-
src/Resources.vala | 12 +
src/db/DatabaseTable.vala | 2 +-
src/db/Db.vala | 26 +
src/db/FaceLocationTable.vala | 76 +-
src/db/FaceTable.vala | 48 +-
src/faces/Face.vala | 29 +-
src/faces/FaceDetect.vala | 93 ++
src/faces/FaceLocation.vala | 46 +-
src/faces/FacePage.vala | 14 +
src/faces/FaceShape.vala | 69 +-
src/faces/FacesTool.vala | 194 ++--
src/meson.build | 9 +
.../facedetect-haarcascade.xml | 0
.../shotwell-facedetect/facedetect-opencv.cpp | 175 +++
subprojects/shotwell-facedetect/meson.build | 51 +
.../org.gnome.Shotwell.Faces1.desktop.in | 7 +
.../org.gnome.Shotwell.Faces1.service.in | 3 +
.../org.gnome.ShotwellFaces1.xml | 51 +
.../shotwell-facedetect/shotwell-facedetect.cpp | 116 ++
.../shotwell-facedetect/shotwell-facedetect.hpp | 36 +
vapi/opencv.vapi | 1116 ++++++++++++++++++++
32 files changed, 2261 insertions(+), 299 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]