Peter M. Groen / openbr

Commit 4e5314285d6658e1641af822c878d0ca350aa00b

Authored by Josh Klontz
2 parents 5c501eea 7f098f0f

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

Inline Side-by-side
Showing 2 changed files with 6 additions and 0 deletions
sdk/plugins/algorithms.cpp
  View file @4e53142
@@ -59,6 +59,8 @@ class AlgorithmsInitializer : public Initializer @@ -59,6 +59,8 @@ class AlgorithmsInitializer : public Initializer
59 Globals->abbreviations.insert("ColoredLBP", "Open+Affine(128,128,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+ColoredU2"); 59 Globals->abbreviations.insert("ColoredLBP", "Open+Affine(128,128,0.37,0.45)+Cvt(Gray)+Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+ColoredU2");
60 60
61 // Transforms 61 // Transforms
  62 + Globals->abbreviations.insert("SketchDetector", "(Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RenameFirst([eyeLx,ASEF_Right_Eye_X],Affine_0_X)+RenameFirst([eyeLy,ASEF_Right_Eye_Y],Affine_0_Y)+RenameFirst([eyeRx,ASEF_Left_Eye_X],Affine_1_X)+RenameFirst([eyeRy,ASEF_Left_Eye_Y],Affine_1_Y))");
  63 + // Globals->abbreviations.insert("SketchDetector", "(EnsureChannels(3)+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)+Cvt(Gray))");
62 Globals->abbreviations.insert("FaceDetection", "(Open+Cvt(Gray)+Cascade(FrontalFace))"); 64 Globals->abbreviations.insert("FaceDetection", "(Open+Cvt(Gray)+Cascade(FrontalFace))");
63 Globals->abbreviations.insert("DenseLBP", "(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))"); 65 Globals->abbreviations.insert("DenseLBP", "(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))");
64 Globals->abbreviations.insert("DenseSIFT", "(Grid(10,10)+SIFTDescriptor(12)+ByRow)"); 66 Globals->abbreviations.insert("DenseSIFT", "(Grid(10,10)+SIFTDescriptor(12)+ByRow)");
sdk/plugins/eyes.cpp
  View file @4e53142
@@ -185,6 +185,10 @@ private: @@ -185,6 +185,10 @@ private:
185 dst = src; 185 dst = src;
186 dst.file.appendLandmark(QPointF(first_eye_x, first_eye_y)); 186 dst.file.appendLandmark(QPointF(first_eye_x, first_eye_y));
187 dst.file.appendLandmark(QPointF(second_eye_x, second_eye_y)); 187 dst.file.appendLandmark(QPointF(second_eye_x, second_eye_y));
  188 + dst.file.insert("ASEF_Right_Eye_X", first_eye_x);
  189 + dst.file.insert("ASEF_Right_Eye_Y", first_eye_y);
  190 + dst.file.insert("ASEF_Left_Eye_X", second_eye_x);
  191 + dst.file.insert("ASEF_Left_Eye_Y", second_eye_y);
188 } 192 }
189 }; 193 };
190 194