Commit 2b62de7b306f9ca4b5b20a8a6c3b5b8fe9143aba
1 parent
fea31bb9
minor fixes
Showing
2 changed files
with
3 additions
and
1 deletions
CMakeLists.txt
| @@ -19,9 +19,11 @@ set(PACKAGE_YEAR 2013) | @@ -19,9 +19,11 @@ set(PACKAGE_YEAR 2013) | ||
| 19 | 19 | ||
| 20 | if(${CMAKE_VERSION} VERSION_EQUAL 2.8.11) | 20 | if(${CMAKE_VERSION} VERSION_EQUAL 2.8.11) |
| 21 | cmake_policy(SET CMP0020 OLD) | 21 | cmake_policy(SET CMP0020 OLD) |
| 22 | + cmake_policy(SET CMP0022 OLD) | ||
| 22 | endif() | 23 | endif() |
| 23 | if(${CMAKE_VERSION} VERSION_GREATER 2.8.11) | 24 | if(${CMAKE_VERSION} VERSION_GREATER 2.8.11) |
| 24 | cmake_policy(SET CMP0020 OLD) | 25 | cmake_policy(SET CMP0020 OLD) |
| 26 | + cmake_policy(SET CMP0022 OLD) | ||
| 25 | endif() | 27 | endif() |
| 26 | 28 | ||
| 27 | if(${CMAKE_SIZEOF_VOID_P} MATCHES 8) | 29 | if(${CMAKE_SIZEOF_VOID_P} MATCHES 8) |
openbr/plugins/pp5.cpp
| @@ -45,7 +45,7 @@ class PP5Initializer : public Initializer | @@ -45,7 +45,7 @@ class PP5Initializer : public Initializer | ||
| 45 | void initialize() const | 45 | void initialize() const |
| 46 | { | 46 | { |
| 47 | TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key)) | 47 | TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key)) |
| 48 | - Globals->abbreviations.insert("PP5","Open!PP5Enroll:PP5Compare"); | 48 | + Globals->abbreviations.insert("PP5","Open+Expand+PP5Enroll:PP5Compare"); |
| 49 | Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)"); | 49 | Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)"); |
| 50 | Globals->abbreviations.insert("PP5CropFace", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)+Affine(128,128,0.25,0.35)+Cvt(Gray)"); | 50 | Globals->abbreviations.insert("PP5CropFace", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)+Affine(128,128,0.25,0.35)+Cvt(Gray)"); |
| 51 | } | 51 | } |