summaryrefslogtreecommitdiff
path: root/src/faces/FacesTool.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:03 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-05-21 19:44:03 +0200
commita8c434f4f345295c14ec60106ca2693c25db1d83 (patch)
tree98c41a82a02589269d79423907e046397107e080 /src/faces/FacesTool.vala
parent6dc4a14e122270c93a2940011ec451719aac22d2 (diff)
parent9e0516824a0f79514aca5d6dbb1aa21cd247ba05 (diff)
Update upstream source from tag 'upstream/0.30.16'
Update to upstream version '0.30.16' with Debian dir 8b17bfc99ecdf47f0885a81b749fceeaeb53601f
Diffstat (limited to 'src/faces/FacesTool.vala')
-rw-r--r--src/faces/FacesTool.vala13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/faces/FacesTool.vala b/src/faces/FacesTool.vala
index cf53736..9803787 100644
--- a/src/faces/FacesTool.vala
+++ b/src/faces/FacesTool.vala
@@ -4,7 +4,6 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
-#if ENABLE_FACES
public errordomain FaceShapeError {
CANT_CREATE
}
@@ -155,7 +154,9 @@ public class FacesTool : EditingTools.EditingTool {
help_layout.pack_start(help_text, true);
response_layout = new Gtk.Box(Gtk.Orientation.HORIZONTAL, CONTROL_SPACING);
+ #if ENABLE_FACE_DETECTION
response_layout.add(detection_button);
+ #endif
response_layout.add(cancel_button);
response_layout.add(ok_button);
@@ -348,10 +349,12 @@ public class FacesTool : EditingTools.EditingTool {
if (line.length == 0)
continue;
+ debug("shotwell-facedetect: %s", line);
+
string[] type_and_serialized = line.split(";");
if (type_and_serialized.length != 2) {
- critical("Wrong serialized line in face detection program output.");
- assert_not_reached();
+ // Pass on external helper log output as our debug log
+ continue;
}
switch (type_and_serialized[0]) {
@@ -373,7 +376,7 @@ public class FacesTool : EditingTools.EditingTool {
assert_not_reached();
default:
- assert_not_reached();
+ break;
}
}
}
@@ -973,5 +976,3 @@ public class FacesTool : EditingTools.EditingTool {
face_detection.cancel();
}
}
-
-#endif