Merge branch 'dev_branch' into 'master'

Fix for the "empty image" issue

See merge request !3

bob/ip/dlib/FaceDetector.py

@@ -58,7 +58,7 @@ class FaceDetector(object):
     def detect_single_face(self, image):
 
         faces = self.detect_all_faces(image)
-        if len(faces) > 1:
+        if len(faces) > 1 and not all([not f for f in faces]):
             index = numpy.argmax([(f.bottomright[0] - f.topleft[0]) * (f.bottomright[1] - f.topleft[1]) for f in faces[0]])
             return (faces[0][index], faces[1][index])
         else:

bob/ip/dlib/test/test.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+
+"""Test Units
+"""
+#==============================================================================
+# Import what is needed here:
+import numpy as np
+
+from .. import FaceDetector
+
+def test_face_detector():
+    """
+    Test FaceDetector class.
+    """
+
+    image = np.zeros((3, 100, 100))
+
+    result = FaceDetector().detect_single_face(image)
+
+    assert result is None
+
+    image = np.ones((3, 100, 100))
+
+    result = FaceDetector().detect_single_face(image)
+
+    assert result is None
\ No newline at end of file

test-requirements.txt

+nose
+