diff --git a/openbr/CMakeLists.txt b/openbr/CMakeLists.txt index bc9b2b5..162392b 100644 --- a/openbr/CMakeLists.txt +++ b/openbr/CMakeLists.txt @@ -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) diff --git a/openbr/janus b/openbr/janus index 9eea6b0..929bf94 160000 --- a/openbr/janus +++ b/openbr/janus @@ -1 +1 @@ -Subproject commit 9eea6b0b9c29335c112d69407fa952bebaed9220 +Subproject commit 929bf94d6002d68b0d9c7a0b98a9c210d86bb7e6 diff --git a/openbr/openbr_export.cpp b/openbr/openbr_export.cpp index 8eef195..8498438 100644 --- a/openbr/openbr_export.cpp +++ b/openbr/openbr_export.cpp @@ -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. diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 7bf2ab4..d2e8f39 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -228,7 +228,7 @@ void File::appendRect(const QRectF &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 &rects) m_metadata["Rects"] = newRects; } -void File::appendRects(const QList &rects) +void File::appendRects(const QList &rects) { appendRects(OpenCVUtils::fromRects(rects)); } diff --git a/share/openbr/Doxyfile.in b/share/openbr/Doxyfile.in index 4d0b7d2..8dd1789 100644 --- a/share/openbr/Doxyfile.in +++ b/share/openbr/Doxyfile.in @@ -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