Peter M. Groen / openbr

Commit 6a1be000c9b8135d3bc119f5e17dfdd9afad4bfc

Authored by Scott Klum
2 parents 24aad7b3 2fb04e0d

Merge branch 'master' of https://github.com/biometrics/openbr

Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
openbr/plugins/hist.cpp
  View file @6a1be00
... ... @@ -83,7 +83,8 @@ class BinTransform : public UntrainableTransform
83 83  
84 84 void project(const Template &src, Template &dst) const
85 85 {
86   - src.m().convertTo(dst, bins > 256 ? CV_16U : CV_8U, bins/(max-min), -0.5 /* floor */);
  86 + const double floor = ((src.m().depth() == CV_32F) || (src.m().depth() == CV_64F)) ? -0.5 : 0;
  87 + src.m().convertTo(dst, bins > 256 ? CV_16U : CV_8U, bins/(max-min), floor);
87 88 if (!split) return;
88 89  
89 90 Mat input = dst;
... ...
openbr/plugins/integral.cpp
  View file @6a1be00
... ... @@ -38,10 +38,10 @@ class IntegralSamplerTransform : public UntrainableTransform
38 38 Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false)
39 39 Q_PROPERTY(float stepFactor READ get_stepFactor WRITE set_stepFactor RESET reset_stepFactor STORED false)
40 40 Q_PROPERTY(int minSize READ get_minSize WRITE set_minSize RESET reset_minSize STORED false)
41   - BR_PROPERTY(int, scales, 5)
42   - BR_PROPERTY(float, scaleFactor, 1.5)
  41 + BR_PROPERTY(int, scales, 6)
  42 + BR_PROPERTY(float, scaleFactor, 2)
43 43 BR_PROPERTY(float, stepFactor, 0.75)
44   - BR_PROPERTY(int, minSize, 8)
  44 + BR_PROPERTY(int, minSize, 6)
45 45  
46 46 void project(const Template &src, Template &dst) const
47 47 {
... ...
openbr/plugins/pp5.cpp
  View file @6a1be00
... ... @@ -47,7 +47,7 @@ class PP5Initializer : public Initializer
47 47 {
48 48 TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key))
49 49 Globals->abbreviations.insert("PP5","Open!PP5Enroll:PP5Compare");
50   - Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeLx,PP5_Landmark0_Right_Eye_X],Affine_0_X)+RenameFirst([eyeLy,PP5_Landmark0_Right_Eye_Y],Affine_0_Y)+RenameFirst([eyeRx,PP5_Landmark1_Left_Eye_X],Affine_1_X)+RenameFirst([eyeRy,PP5_Landmark1_Left_Eye_Y],Affine_1_Y)");
  50 + Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)");
51 51 }
52 52  
53 53 void finalize() const
... ...