From 22015b6870f05e37ec84610047dcd0e19acd748f Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Fri, 28 Sep 2018 11:29:49 -0600
Subject: [PATCH] Fixed issue from rebasing
---
bob/ip/facedetect/detect.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bob/ip/facedetect/detect.py b/bob/ip/facedetect/detect.py
index 69465e0..ae3c757 100644
--- a/bob/ip/facedetect/detect.py
+++ b/bob/ip/facedetect/detect.py
@@ -224,12 +224,12 @@ def detect_all_faces(image, cascade = None, sampler = None, threshold = 0, overl
# group overlapping detections
if minimum_overlap < 1.:
- bbs, qualities = group_detections(detections, predictions, minimum_overlap, threshold, overlaps)
+ detections, predictions = group_detections(detections, predictions, minimum_overlap, threshold, overlaps)
if not detections:
return None
# average them
- bbs, qualities = zip(*[average_detections(b, q, relative_prediction_threshold) for b,q in zip(bbs, qualities)])
+ detections, predictions = zip(*[average_detections(b, q, relative_prediction_threshold) for b,q in zip(detections, predictions)])
return detections, predictions
--
GitLab