diff --git a/openbr/plugins/hist.cpp b/openbr/plugins/hist.cpp index 3c879e0..ccbc654 100644 --- a/openbr/plugins/hist.cpp +++ b/openbr/plugins/hist.cpp @@ -83,7 +83,8 @@ class BinTransform : public UntrainableTransform void project(const Template &src, Template &dst) const { - src.m().convertTo(dst, bins > 256 ? CV_16U : CV_8U, bins/(max-min), -0.5 /* floor */); + const double floor = ((src.m().depth() == CV_32F) || (src.m().depth() == CV_64F)) ? -0.5 : 0; + src.m().convertTo(dst, bins > 256 ? CV_16U : CV_8U, bins/(max-min), floor); if (!split) return; Mat input = dst; diff --git a/openbr/plugins/integral.cpp b/openbr/plugins/integral.cpp index 7772453..f6978d4 100644 --- a/openbr/plugins/integral.cpp +++ b/openbr/plugins/integral.cpp @@ -38,10 +38,10 @@ class IntegralSamplerTransform : public UntrainableTransform Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false) Q_PROPERTY(float stepFactor READ get_stepFactor WRITE set_stepFactor RESET reset_stepFactor STORED false) Q_PROPERTY(int minSize READ get_minSize WRITE set_minSize RESET reset_minSize STORED false) - BR_PROPERTY(int, scales, 5) - BR_PROPERTY(float, scaleFactor, 1.5) + BR_PROPERTY(int, scales, 6) + BR_PROPERTY(float, scaleFactor, 2) BR_PROPERTY(float, stepFactor, 0.75) - BR_PROPERTY(int, minSize, 8) + BR_PROPERTY(int, minSize, 6) void project(const Template &src, Template &dst) const { diff --git a/openbr/plugins/pp5.cpp b/openbr/plugins/pp5.cpp index 182f628..921bb14 100644 --- a/openbr/plugins/pp5.cpp +++ b/openbr/plugins/pp5.cpp @@ -47,7 +47,7 @@ class PP5Initializer : public Initializer { TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key)) Globals->abbreviations.insert("PP5","Open!PP5Enroll:PP5Compare"); - 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)"); + Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)"); } void finalize() const