Commit 64c0a61e74a7dc8d41ea4e2c38c201c8a732201e
1 parent
8fbb3896
updated to latest janus
Showing
4 changed files
with
5 additions
and
16 deletions
openbr/CMakeLists.txt
| @@ -5,6 +5,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) | @@ -5,6 +5,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||
| 5 | # Janus API | 5 | # Janus API |
| 6 | include_directories(janus/include) | 6 | include_directories(janus/include) |
| 7 | install(DIRECTORY janus/include DESTINATION .) | 7 | install(DIRECTORY janus/include DESTINATION .) |
| 8 | +set(BR_JANUS janus/src/janus_io.cpp janus/src/opencv_io/opencv_io.cpp) | ||
| 9 | +add_definitions(-DJANUS_LIBRARY) | ||
| 8 | 10 | ||
| 9 | # Collect source files | 11 | # Collect source files |
| 10 | aux_source_directory(. SRC) | 12 | aux_source_directory(. SRC) |
| @@ -19,7 +21,7 @@ if(NOT ${BR_EMBEDDED}) | @@ -19,7 +21,7 @@ if(NOT ${BR_EMBEDDED}) | ||
| 19 | install(FILES ${HEADERS} DESTINATION include/openbr/gui) | 21 | install(FILES ${HEADERS} DESTINATION include/openbr/gui) |
| 20 | endif() | 22 | endif() |
| 21 | 23 | ||
| 22 | -add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC}) | 24 | +add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_JANUS} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC}) |
| 23 | qt5_use_modules(openbr ${QT_DEPENDENCIES}) | 25 | qt5_use_modules(openbr ${QT_DEPENDENCIES}) |
| 24 | set_target_properties(openbr PROPERTIES | 26 | set_target_properties(openbr PROPERTIES |
| 25 | DEFINE_SYMBOL BR_LIBRARY | 27 | DEFINE_SYMBOL BR_LIBRARY |
openbr/janus.cpp
| 1 | -#ifdef BR_LIBRARY | ||
| 2 | - #define JANUS_LIBRARY | ||
| 3 | -#endif | ||
| 4 | - | ||
| 5 | #include "janus.h" | 1 | #include "janus.h" |
| 6 | #include "janus_io.h" | 2 | #include "janus_io.h" |
| 7 | #include "openbr_plugin.h" | 3 | #include "openbr_plugin.h" |
| @@ -20,7 +16,7 @@ janus_error janus_initialize(const char *sdk_path, const char *model_file) | @@ -20,7 +16,7 @@ janus_error janus_initialize(const char *sdk_path, const char *model_file) | ||
| 20 | { | 16 | { |
| 21 | int argc = 1; | 17 | int argc = 1; |
| 22 | const char *argv[1] = { "janus" }; | 18 | const char *argv[1] = { "janus" }; |
| 23 | - Context::initialize(argc, (char**)argv, sdk_path); | 19 | + Context::initialize(argc, (char**)argv, sdk_path, false); |
| 24 | QString algorithm = model_file; | 20 | QString algorithm = model_file; |
| 25 | if (algorithm.isEmpty()) { | 21 | if (algorithm.isEmpty()) { |
| 26 | transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false); | 22 | transform = Transform::fromAlgorithm("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", false); |
openbr/janus_io.cpp deleted