From afc91641271bbd9dcf9384ddbd304291e1a03090 Mon Sep 17 00:00:00 2001
From: Matias De lellis <mati86dl@gmail.com>
Date: Sat, 29 Feb 2020 14:04:41 -0300
Subject: [PATCH] HOG detector also must return the rectangles of the
 detections.

---
 .gitignore                     | 13 ++++++-------
 README.md                      |  5 ++---
 php_pdlib.h                    |  2 +-
 src/face_detection.cc          | 17 ++++++++++++++---
 tests/dlib_face_detection.phpt | 18 ++++++++++++++++++
 5 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 tests/dlib_face_detection.phpt

diff --git a/.gitignore b/.gitignore
index 54983d3..2f6ab2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,12 +28,11 @@ missing
 mkinstalldirs
 modules
 run-tests.php
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-
+tests/*.diff
+tests/*.out
+tests/*.php
+tests/*.exp
+tests/*.log
+tests/*.sh
 .idea
 cmake-build-debug
diff --git a/README.md b/README.md
index 81ca51b..f2a800e 100644
--- a/README.md
+++ b/README.md
@@ -100,9 +100,8 @@ If you want to use HOG based approach:
 <?php
 
 // face detection
-$faceCount = dlib_face_detection("~/a.jpg");
-// how mary face in the picture.
-var_dump($faceCount);
+detected_faces = dlib_face_detection("image.jpg");
+// $detected_faces is indexed array, where values are assoc arrays with "top", "bottom", "left" and "right" values
 ```
 
 If you want to use CNN approach (and CNN model):
diff --git a/php_pdlib.h b/php_pdlib.h
index ddd3dfb..ab29c2e 100644
--- a/php_pdlib.h
+++ b/php_pdlib.h
@@ -31,7 +31,7 @@ extern "C" {
 extern zend_module_entry pdlib_module_entry;
 #define phpext_pdlib_ptr &pdlib_module_entry
 
-#define PHP_PDLIB_VERSION "0.1.0" /* Replace with version number for your extension */
+#define PHP_PDLIB_VERSION "1.0.1" /* Replace with version number for your extension */
 
 #ifdef PHP_WIN32
 #	define PHP_PDLIB_API __declspec(dllexport)
diff --git a/src/face_detection.cc b/src/face_detection.cc
index e172ecb..3a2563b 100644
--- a/src/face_detection.cc
+++ b/src/face_detection.cc
@@ -15,7 +15,7 @@ PHP_FUNCTION(dlib_face_detection)
     char  *img_path;
     size_t  img_path_len;
 
-    if(zend_parse_parameters(ZEND_NUM_ARGS(), "s", &img_path, &img_path_len) == FAILURE){
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &img_path, &img_path_len) == FAILURE) {
         RETURN_FALSE;
     }
     try {
@@ -24,9 +24,20 @@ PHP_FUNCTION(dlib_face_detection)
         array2d<unsigned char> img;
         load_image(img, img_path);
 
-        pyramid_up(img);
+        array_init(return_value);
+
         std::vector<rectangle> dets = detector(img);
-        RETURN_LONG(dets.size());
+        for (unsigned long i = 0; i < dets.size(); ++i) {
+            zval rect_arr;
+            array_init(&rect_arr);
+            add_assoc_long(&rect_arr, "left", dets[i].left());
+            add_assoc_long(&rect_arr, "top", dets[i].top());
+            add_assoc_long(&rect_arr, "right", dets[i].right());
+            add_assoc_long(&rect_arr, "bottom", dets[i].bottom());
+            // Add this assoc array to returned array
+            //
+            add_next_index_zval(return_value, &rect_arr);
+        }
     }
     catch (exception& e)
     {
diff --git a/tests/dlib_face_detection.phpt b/tests/dlib_face_detection.phpt
new file mode 100644
index 0000000..8057bf4
--- /dev/null
+++ b/tests/dlib_face_detection.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Frontal face detection.
+--SKIPIF--
+<?php if (!extension_loaded("pdlib") print "skip"; ?>
+--FILE--
+<?php
+printf("Detection\n");
+$detected_faces = dlib_face_detection(__DIR__ . "/lenna.jpg");
+printf("Faces found = %d\n", count($detected_faces));
+foreach($detected_faces as $index => $detected_face) {
+  printf("Face[%d] in bounding box (left=%d, top=%d, right=%d, bottom=%d)\n", $index,
+    $detected_face["left"], $detected_face["top"], $detected_face["right"], $detected_face["bottom"]);
+}
+?>
+--EXPECT--
+Detection
+Faces found = 1
+Face[0] in bounding box (left=214, top=194, right=393, bottom=373)
\ No newline at end of file