From 1fb3a925a68459db79022e2a38d2ab3dbce31e6c Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Mon, 25 Feb 2013 16:19:40 -0500 Subject: [PATCH] pp5 abbreviation fix --- sdk/plugins/pp5.cpp | 2 +- share/openbr/cmake/FindStasm.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/plugins/pp5.cpp b/sdk/plugins/pp5.cpp index 79c24e6..0fc606a 100644 --- a/sdk/plugins/pp5.cpp +++ b/sdk/plugins/pp5.cpp @@ -46,7 +46,7 @@ class PP5Initializer : public Initializer void initialize() const { TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key)) - Globals->abbreviations.insert("PP5","Open+PP5Enroll!Identity:PP5Compare"); + Globals->abbreviations.insert("PP5","Open!PP5Enroll:PP5Compare"); Globals->abbreviations.insert("RegisterFace", "Open+Cvt(Gray)+PP5Enroll(true)+Rename(PP5_Landmark0_Right_Eye_X,Affine_0_X)+Rename(PP5_Landmark0_Right_Eye_Y,Affine_0_Y)+Rename(PP5_Landmark1_Left_Eye_X,Affine_1_X)+Rename(PP5_Landmark1_Left_Eye_Y,Affine_1_Y)+Affine(96,128,0.28,0.45)"); } diff --git a/share/openbr/cmake/FindStasm.cmake b/share/openbr/cmake/FindStasm.cmake index 5c12554..8c4b7ef 100644 --- a/share/openbr/cmake/FindStasm.cmake +++ b/share/openbr/cmake/FindStasm.cmake @@ -10,7 +10,9 @@ find_path(Stasm_DIR include/stasm.hpp ${CMAKE_SOURCE_DIR}/3rdparty/*) +add_subdirectory(${Stasm_DIR} ${Stasm_DIR}/build) + include_directories(${Stasm_DIR}/include) -link_directories(${Stasm_DIR}/lib) +link_directories(${Stasm_DIR}/build) set(Stasm_LIBS stasm) -- libgit2 0.21.4