From 64c0a61e74a7dc8d41ea4e2c38c201c8a732201e Mon Sep 17 00:00:00 2001
From: Josh Klontz <Joshua.Klontz@noblis.org>
Date: Mon, 5 May 2014 09:59:36 -0400
Subject: [PATCH] updated to latest janus

---
 openbr/CMakeLists.txt |  4 +++-
 openbr/janus          |  2 +-
 openbr/janus.cpp      |  6 +-----
 openbr/janus_io.cpp   |  9 ---------
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 openbr/janus_io.cpp

diff --git a/openbr/CMakeLists.txt b/openbr/CMakeLists.txt
index c4bf747..8d2102c 100644
--- a/openbr/CMakeLists.txt
+++ b/openbr/CMakeLists.txt
@@ -5,6 +5,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # Janus API
 include_directories(janus/include)
 install(DIRECTORY janus/include DESTINATION .)
+set(BR_JANUS janus/src/janus_io.cpp janus/src/opencv_io/opencv_io.cpp)
+add_definitions(-DJANUS_LIBRARY)
 
 # Collect source files
 aux_source_directory(. SRC)
@@ -19,7 +21,7 @@ if(NOT ${BR_EMBEDDED})
   install(FILES ${HEADERS} DESTINATION include/openbr/gui)
 endif()
 
-add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC})
+add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_JANUS} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC})
 qt5_use_modules(openbr ${QT_DEPENDENCIES})
 set_target_properties(openbr PROPERTIES
                              DEFINE_SYMBOL BR_LIBRARY
diff --git a/openbr/janus b/openbr/janus
index f8d9c86..cdac0b6 160000
--- a/openbr/janus
+++ b/openbr/janus
@@ -1 +1 @@
-Subproject commit f8d9c869c821cc032d092ab1274da8f3cabf5eb7
+Subproject commit cdac0b653134087198dd9230bc0956d4dfab4b85
diff --git a/openbr/janus.cpp b/openbr/janus.cpp
index 3a567fb..53360e9 100644
--- a/openbr/janus.cpp
+++ b/openbr/janus.cpp
@@ -1,7 +1,3 @@
-#ifdef BR_LIBRARY
-  #define JANUS_LIBRARY
-#endif
-
 #include "janus.h"
 #include "janus_io.h"
 #include "openbr_plugin.h"
@@ -20,7 +16,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);
+    Context::initialize(argc, (char**)argv, sdk_path, false);
     QString algorithm = model_file;
     if (algorithm.isEmpty()) {
         transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false);
diff --git a/openbr/janus_io.cpp b/openbr/janus_io.cpp
deleted file mode 100644
index 504970e..0000000
--- a/openbr/janus_io.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef BR_LIBRARY
-  #define JANUS_LIBRARY
-#endif
-
-// Use the provided default implementation of some functions
-#include "janus/src/janus_io.cpp"
-
-// Use the provided OpenCV I/O implementation
-#include "janus/src/opencv_io/opencv_io.cpp"
--
libgit2 0.21.4