initial configuration for janus submodule

Josh Klontz
1 parent 00bdac9d
Showing 5 changed files with 13 additions and 5 deletions
openbr/CMakeLists.txt
openbr/janus
openbr/openbr_export.cpp
openbr/openbr_plugin.cpp
share/openbr/Doxyfile.in
@@ -2,6 +2,14 @@
 configure_file(${BR_SHARE_DIR}/version.h.in version.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
  
+# Janus API
+set(JANUS_BUILD_PP5_WRAPPER ${BR_WITH_PP5} CACHE BOOL "Build Janus implementation using PittPatt 5")
+set(JANUS_BUILD_DOCS ${BR_BUILD_DOCUMENTATION} CACHE BOOL "Build Janus HTML Doxygen documentation")
+mark_as_advanced(JANUS_BUILD_PP5_WRAPPER)
+mark_as_advanced(JANUS_BUILD_DOCS)
+add_subdirectory(janus)
+install(DIRECTORY janus/include DESTINATION .)
+
 # Collect source files
 aux_source_directory(. SRC)
 aux_source_directory(core BR_CORE)
-Subproject commit 9eea6b0b9c29335c112d69407fa952bebaed9220
+Subproject commit 929bf94d6002d68b0d9c7a0b98a9c210d86bb7e6
@@ -16,7 +16,7 @@
  
 /*!
  * \mainpage
- * \section overview Overview
+ * \page overview Overview
  * OpenBR \cite klontz2013open is a framework for investigating new modalities, improving existing algorithms, interfacing with commercial systems, measuring recognition performance, and deploying automated biometric systems.
  * The project is designed to facilitate rapid algorithm prototyping, and features a mature core framework, flexible plugin system, and support for open and closed source development.
  * Off-the-shelf algorithms are also available for specific modalities including \ref cpp_face_recognition, \ref cpp_age_estimation, and \ref cpp_gender_estimation.
@@ -228,7 +228,7 @@ void File::appendRect(const QRectF &amp;rect)
     m_metadata["Rects"] = newRects;
 }
  
-void File::appendRect(const Rect &rect)
+void File::appendRect(const cv::Rect &rect)
 {
     appendRect(OpenCVUtils::fromRect(rect));
 }
@@ -241,7 +241,7 @@ void File::appendRects(const QList&lt;QRectF&gt; &amp;rects)
     m_metadata["Rects"] = newRects;
 }
  
-void File::appendRects(const QList<Rect> &rects)
+void File::appendRects(const QList<cv::Rect> &rects)
 {
     appendRects(OpenCVUtils::fromRects(rects));
 }
@@ -688,7 +688,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
  
-EXCLUDE                =
+EXCLUDE                = ${CMAKE_SOURCE_DIR}/openbr/janus
  
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded