From b34f9cc43164e30d84ee64f3d3870b507c3aae39 Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh.klontz@gmail.com>
Date: Fri, 25 Mar 2016 12:02:30 -0400
Subject: [PATCH] DLandmarker cleanup

---
 openbr/plugins/classification/dlib.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/openbr/plugins/classification/dlib.cpp b/openbr/plugins/classification/dlib.cpp
index 2ea2732..6dbbb88 100644
--- a/openbr/plugins/classification/dlib.cpp
+++ b/openbr/plugins/classification/dlib.cpp
@@ -74,25 +74,21 @@ private:
         array2d<unsigned char> image;
         assign_image(image,cimg);
 
-        if (src.file.rects().isEmpty()) { //If the image has no rects assume the whole image is a face
-            rectangle r(0, 0, cvImage.cols, cvImage.rows);
-            full_object_detection shape = (*sp)(image, r);
-            for (size_t i = 0; i < shape.num_parts(); i++)
-                dst.file.appendPoint(QPointF(shape.part(i)(0),shape.part(i)(1)));
-            setFacePoints(dst);
-        }
-        else { // Crop the image on the rects
-            for (int j=0; j<src.file.rects().size(); ++j)
-            {
-                QRectF rect = src.file.rects()[j];
-                rectangle r(rect.left(),rect.top(),rect.right(),rect.bottom());
-                full_object_detection shape = (*sp)(image, r);
-                for (size_t i=0; i<shape.num_parts(); i++)
-                    dst.file.appendPoint(QPointF(shape.part(i)(0),shape.part(i)(1)));
-                setFacePoints(dst);
-            }
+        rectangle r;
+        if (src.file.rects().isEmpty()) { // If the image has no rects assume the whole image is a face
+            r = rectangle(0, 0, cvImage.cols, cvImage.rows);
+        } else { // Crop the image on the first rect
+            const QRectF rect = src.file.rects().first();
+            r = rectangle(rect.left(), rect.top(), rect.right(), rect.bottom());
         }
 
+        full_object_detection shape = (*sp)(image, r);
+        QList<QPointF> points;
+        for (size_t i=0; i<shape.num_parts(); i++)
+            points.append(QPointF(shape.part(i)(0), shape.part(i)(1)));
+        dst.file.setPoints(points);
+        setFacePoints(dst);
+
         shapeResource.release(sp);
     }
 };
--
libgit2 0.21.4