From 303a0d8a03f82c3cff4038bd27098e5a56ecb29b Mon Sep 17 00:00:00 2001
From: Josh Klontz <Joshua.Klontz@noblis.org>
Date: Tue, 6 May 2014 14:31:26 -0400
Subject: [PATCH] updated to latest janus

---
 openbr/janus     |  2 +-
 openbr/janus.cpp | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openbr/janus b/openbr/janus
index 9844d8a..af63eb3 160000
--- a/openbr/janus
+++ b/openbr/janus
@@ -1 +1 @@
-Subproject commit 9844d8a3a0a90344ad9382b9e99e51a913dfbcfb
+Subproject commit af63eb32f4bb271e78296b9740fb0d9f004b27e8
diff --git a/openbr/janus.cpp b/openbr/janus.cpp
index d8f6eb3..cff4547 100644
--- a/openbr/janus.cpp
+++ b/openbr/janus.cpp
@@ -17,6 +17,7 @@ janus_error janus_initialize(const char *sdk_path, const char *model_file)
     int argc = 1;
     const char *argv[1] = { "janus" };
     Context::initialize(argc, (char**)argv, sdk_path, false);
+    Globals->quiet = true;
     QString algorithm = model_file;
     if (algorithm.isEmpty()) {
         transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false);
@@ -91,7 +92,7 @@ janus_error janus_finalize_template(janus_template template_, janus_flat_templat
     return JANUS_SUCCESS;
 }
 
-janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, const janus_flat_template b, const size_t b_bytes, double *similarity)
+janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, const janus_flat_template b, const size_t b_bytes, float *similarity)
 {
     *similarity = 0;
 
@@ -120,7 +121,7 @@ janus_error janus_verify(const janus_flat_template a, const size_t a_bytes, cons
         return JANUS_UNKNOWN_ERROR;
 
     if (comparisons > 0) *similarity /= comparisons;
-    else                 *similarity = -std::numeric_limits<double>::max();
+    else                 *similarity = -std::numeric_limits<float>::max();
     return JANUS_SUCCESS;
 }
 
@@ -137,13 +138,13 @@ janus_error janus_enroll(const janus_template template_, const janus_template_id
     return JANUS_SUCCESS;
 }
 
-janus_error janus_gallery_size(janus_gallery gallery, int *size)
+janus_error janus_gallery_size(janus_gallery gallery, size_t *size)
 {
     *size = TemplateList::fromGallery(gallery).size();
     return JANUS_SUCCESS;
 }
 
-janus_error janus_compare(janus_gallery target, janus_gallery query, double *similarity_matrix, janus_template_id *target_ids, janus_template_id *query_ids)
+janus_error janus_compare(janus_gallery target, janus_gallery query, float *similarity_matrix, janus_template_id *target_ids, janus_template_id *query_ids)
 {
     const TemplateList targets = TemplateList::fromGallery(target);
     const TemplateList queries = TemplateList::fromGallery(query);
@@ -151,7 +152,7 @@ janus_error janus_compare(janus_gallery target, janus_gallery query, double *sim
     distance->compare(targets, queries, matrix.data());
     const QVector<janus_template_id> targetIds = File::get<janus_template_id,File>(matrix->targetFiles, "TEMPLATE_ID").toVector();
     const QVector<janus_template_id> queryIds  = File::get<janus_template_id,File>(matrix->queryFiles,  "TEMPLATE_ID").toVector();
-    memcpy(similarity_matrix, matrix->data.data, matrix->data.rows * matrix->data.cols * sizeof(double));
+    memcpy(similarity_matrix, matrix->data.data, matrix->data.rows * matrix->data.cols * sizeof(float));
     memcpy(target_ids, targetIds.data(), targetIds.size() * sizeof(janus_template_id));
     memcpy(query_ids, queryIds.data(), queryIds.size() * sizeof(janus_template_id));
     return JANUS_SUCCESS;
--
libgit2 0.21.4