V0.5.0 package

CMakeLists.txt

@@ -76,7 +76,7 @@ endif()
 set(QT_DEPENDENCIES Concurrent Core)
 option(BR_EMBEDDED "Limit software dependencies")
 if(NOT ${BR_EMBEDDED})
-  set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network Sql Svg Widgets Xml)
+  set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Gui Network PrintSupport Sql Svg Widgets Xml)
 endif()
 foreach(QT_DEPENDENCY ${QT_DEPENDENCIES})
   find_package(Qt5${QT_DEPENDENCY})
@@ -85,8 +85,8 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
 
 # Find OpenCV
 find_package(OpenCV REQUIRED)
-set(OPENCV_DEPENDENCIES opencv_calib3d opencv_core opencv_features2d opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_video)
-set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OpenCV_LIBS})
+set(OPENCV_DEPENDENCIES opencv_calib3d opencv_core opencv_features2d opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_video opencv_legacy opencv_ocl)
+set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES})
 
 # Find Alphanum
 find_package(Alphanum REQUIRED)

app/br/br.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include <QApplication>
 #include <QCoreApplication>
 #include <QRunnable>
 #include <QThreadPool>
@@ -284,6 +285,12 @@ class FakeMain : public QRunnable
 
 int main(int argc, char *argv[])
 {
+    QString s(argv[0]);
+    s.truncate(s.lastIndexOf("/"));
+    QDir dir(s);
+    QApplication::setLibraryPaths(QStringList() << dir.absolutePath());
+    QCoreApplication::setLibraryPaths(QStringList() << dir.absolutePath());
+
     const bool gui         = (argc >= 2) && !strcmp(argv[1], "-gui");
     const bool noEventLoop = (argc >= 2) && !strcmp(argv[1], "-noEventLoop");
     br_initialize(argc, argv, "", gui);

openbr/CMakeLists.txt

@@ -52,3 +52,4 @@ install_qt_libraries(QT_DEPENDENCIES)
 install_qt_imageformats()
 install_qt_misc()
 install_opencv_libraries(OPENCV_DEPENDENCIES)
+install_stasm_libs()

openbr/core/core.cpp

@@ -548,13 +548,11 @@ struct AlgorithmCore
             return;
         }
 
-        //! [Parsing the algorithm description]
         const bool compareTransform = description.contains('!');
         QStringList words = QtUtils::parse(description, compareTransform ? '!' : ':');
 
         if ((words.size() < 1) || (words.size() > 2)) qFatal("Invalid algorithm format.");
 
-        //! [Creating the template generation and comparison methods]
         transform = QSharedPointer<Transform>(Transform::make(words[0], NULL));
         simplifyTransform();
 
@@ -567,7 +565,6 @@ struct AlgorithmCore
             else
                 comparison = QSharedPointer<Transform>(Transform::make(words[1], NULL));
         }
-        //! [Creating the template generation and comparison methods]
     }
 };
 

openbr/openbr_export.cpp

@@ -16,7 +16,7 @@
 
 /*!
  * \mainpage
- * \page overview Overview
+ * \section 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.
@@ -55,6 +55,7 @@
  *
  * \section installation_from_source From Source
  * Installation from source is the recommended method for getting OpenBR on your machine.
+ * <b>If you are interested in our off-the-shelf algorithms, please use the latest tagged release instead of the master branch.</b>
  * If you need a little help getting started, choose from the list of build instructions for free C++ compilers below:
  * - \subpage windows_msvc
  * - \subpage osx_clang
@@ -121,6 +122,7 @@
  $ cd /c
  $ git clone https://github.com/biometrics/openbr.git
  $ cd openbr
+ $ git checkout 0.5
  $ git submodule init
  $ git submodule update
  \endcode
@@ -189,6 +191,7 @@
  \code
  $ git clone https://github.com/biometrics/openbr.git
  $ cd openbr
+ $ git checkout 0.5
  $ git submodule init
  $ git submodule update
  \endcode
@@ -275,6 +278,7 @@
  \code
  $ git clone https://github.com/biometrics/openbr.git
  $ cd openbr
+ $ git checkout 0.5
  $ git submodule init
  $ git submodule update
  \endcode
@@ -363,6 +367,7 @@
  \code
  $ git clone https://github.com/biometrics/openbr.git
  $ cd openbr
+ $ git checkout 0.5
  $ git submodule init
  $ git submodule update
  \endcode
@@ -383,11 +388,11 @@
  \endcode
 */
 
- /*!
-  * \page help Help
-  * - Developer mailing list: <a href="https://groups.google.com/forum/?fromgroups#!forum/openbr-dev">openbr-dev@googlegroups.com</a>
-  * - IRC Channel: <a href="http://webchat.freenode.net/?channels=openbr">irc.freenode.net\#openbr</a>
-  */
+/*!
+ * \page help Help
+ * - Developer mailing list: <a href="https://groups.google.com/forum/?fromgroups#!forum/openbr-dev">openbr-dev@googlegroups.com</a>
+ * - IRC Channel: <a href="http://webchat.freenode.net/?channels=openbr">irc.freenode.net\#openbr</a>
+ */
 
 /*!
  * \page qmake_integration QMake Integration
@@ -428,11 +433,8 @@
  *
  * Let's look at some of the important parts of the code base that make this possible!
  *
- * In <tt>AlgorithmCore::init()</tt> in <tt>openbr/core/core.cpp</tt> you can see the code for splitting the algorithm description at the colon:
- * \snippet openbr/core/core.cpp Parsing the algorithm description
- *
- * Shortly thereafter in this function we <i>make</i> the template generation and comparison methods:
- * \snippet openbr/core/core.cpp Creating the template generation and comparison methods
+ * In <tt>AlgorithmCore::init()</tt> in <tt>openbr/core/core.cpp</tt> you can see the code for splitting the algorithm description at the colon.
+ * Shortly thereafter in this function we <i>make</i> the template generation and comparison methods.
  * These make calls are defined in the public \ref cpp_plugin_sdk and can also be called from end user code.
  *
  * Below we discuss some of the source code for \ref br::Transform::make in <tt>openbr/openbr_plugin.cpp</tt>.

openbr/openbr_plugin.cpp

@@ -79,7 +79,7 @@ QString File::hash() const
     return QtUtils::shortTextHash(flat());
 }
 
-void File::append(const QMap<QString,QVariant> &metadata)
+void File::append(const QVariantMap &metadata)
 {
     foreach (const QString &key, metadata.keys())
         set(key, metadata[key]);

openbr/plugins/draw.cpp

@@ -530,7 +530,7 @@ BR_REGISTER(Transform, DrawSegmentation)
 /*!
  * \ingroup transforms
  * \brief Write all mats to disk as images.
- * \author Brendan Klare \bklare
+ * \author Brendan Klare \cite bklare
  */
 class WriteImageTransform : public TimeVaryingTransform
 {

openbr/plugins/stasm4.cmake

@@ -3,12 +3,12 @@ set(BR_WITH_STASM4 ON CACHE BOOL "Build with Stasm")
 if(${BR_WITH_STASM4})
   find_package(Stasm4 REQUIRED)
   set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/stasm4.cpp)
-  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Stasm4_LIBS})
+  #set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Stasm4_LIBS})
 
   if(WIN32)
     install(DIRECTORY ${Stasm_DIR}/build/ DESTINATION bin)
   else()
-    install(DIRECTORY ${Stasm_DIR}/build/ DESTINATION lib)
+    #install(DIRECTORY ${Stasm_DIR}/build/ DESTINATION lib)
   endif()
 
   install(DIRECTORY ${Stasm_DIR}/data/ DESTINATION share/openbr/models/stasm)