From edba806663b4b7d989aed8f743beae8cc6b47131 Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh.klontz@gmail.com>
Date: Mon, 28 Jan 2013 10:17:54 -0500
Subject: [PATCH] PP5 tweaks

---
 .gitignore          | 14 +++++++-------
 sdk/plugins/pp5.cpp | 10 +++-------
 share/openbr/models |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 431612d..c1b9abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,27 @@
-#Repository specific
+### Repository Specific ###
 build*
 3rdparty/pittpatt*
 
-#Generic
+### Generic ###
 *.log
 *.user
 
-#Latex
+### Latex ###
 *.aux
 *.nav
 *.out
 *.snm
 *.toc
 
-#QtCreator
+### QtCreator ###
 *CMakeLists.txt.user*
 
-#R
+### R ###
 *.RData
 *.Rhistory
 
-#Subversion
+### Subversion ###
 *.svn*
 
-#Synology
+### Synology ###
 *.DS*
diff --git a/sdk/plugins/pp5.cpp b/sdk/plugins/pp5.cpp
index 9607397..0feb2a8 100644
--- a/sdk/plugins/pp5.cpp
+++ b/sdk/plugins/pp5.cpp
@@ -38,7 +38,6 @@ using namespace br;
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
  */
-
 class PP5Initializer : public Initializer
 {
     Q_OBJECT
@@ -62,7 +61,6 @@ BR_REGISTER(Initializer, PP5Initializer)
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
  */
-
 struct PP5Context
 {
     ppr_context_type context;
@@ -213,7 +211,6 @@ struct PP5Context
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
  */
-
 class PP5Enroll : public UntrainableTransform
 {
     Q_OBJECT
@@ -249,7 +246,7 @@ class PP5Enroll : public UntrainableTransform
             dst.file.append(PP5Context::toMetadata(face));
             dst += m;
 
-            if (src.file.getBool("ForceEnrollment")) break;
+            if (!src.file.getBool("enrollAll")) break;
         }
 
         ppr_free_face_list(face_list);
@@ -258,7 +255,7 @@ class PP5Enroll : public UntrainableTransform
 
         contexts.release(context);
 
-        if (src.file.getBool("ForceEnrollment") && dst.isEmpty()) {
+        if (!src.file.getBool("enrollAll") && dst.isEmpty()) {
             if (detectOnly) dst += src;
             else            dst += cv::Mat();
         }
@@ -273,7 +270,6 @@ BR_REGISTER(Transform, PP5Enroll)
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
  */
-
 class PP5Compare : public Distance
                  , public PP5Context
 {
@@ -283,7 +279,7 @@ class PP5Compare : public Distance
     {
         (void) target;
         (void) query;
-        qFatal("PP5Compare: _compare should never be called");
+        qFatal("PP5Compare::compare (single templates) should never be called!");
         return 0;
     }
 
diff --git a/share/openbr/models b/share/openbr/models
index a7a133b..5bfe098 160000
--- a/share/openbr/models
+++ b/share/openbr/models
@@ -1 +1 @@
-Subproject commit a7a133b98757d6affadd834b0d96d16e6d8ca04f
+Subproject commit 5bfe0988716f6e7b926910d74f9696f002cdbfb6
--
libgit2 0.21.4