Peter M. Groen / openbr

Commit f75d97320e7db1b76ef32daf5b25d132b696ec8f

Authored by bhklein
1 parent 8fc394cd

Use manually located eye locations.

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
openbr/janus.cpp
  View file @f75d973
@@ -25,7 +25,7 @@ janus_error janus_initialize(const char *sdk_path, const char *temp_path, const @@ -25,7 +25,7 @@ janus_error janus_initialize(const char *sdk_path, const char *temp_path, const
25 transform.reset(Transform::make("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", NULL)); 25 transform.reset(Transform::make("Cvt(Gray)+Affine(88,88,0.25,0.35)+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>", NULL));
26 distance = Distance::fromAlgorithm("FaceRecognition"); 26 distance = Distance::fromAlgorithm("FaceRecognition");
27 } else if (algorithm.compare("Component") == 0) { 27 } else if (algorithm.compare("Component") == 0) {
28 - transform.reset(Transform::make("LandmarksAffine+Cvt(Gray)+<ComponentEnroll>", NULL)); 28 + transform.reset(Transform::make("StasmManual+Cvt(Gray)+<ComponentEnroll>", NULL));
29 distance = Distance::fromAlgorithm(algorithm); 29 distance = Distance::fromAlgorithm(algorithm);
30 } else { 30 } else {
31 transform.reset(Transform::make(algorithm + "Enroll", NULL)); 31 transform.reset(Transform::make(algorithm + "Enroll", NULL));
@@ -86,6 +86,8 @@ janus_error janus_augment(const janus_image image, const janus_attribute_list at @@ -86,6 +86,8 @@ janus_error janus_augment(const janus_image image, const janus_attribute_list at
86 t.file.contains("LEFT_EYE_Y")) { 86 t.file.contains("LEFT_EYE_Y")) {
87 t.file.set("Affine_0", QPointF(t.file.get<float>("RIGHT_EYE_X") - rect.x(), t.file.get<float>("RIGHT_EYE_Y") - rect.y())); 87 t.file.set("Affine_0", QPointF(t.file.get<float>("RIGHT_EYE_X") - rect.x(), t.file.get<float>("RIGHT_EYE_Y") - rect.y()));
88 t.file.set("Affine_1", QPointF(t.file.get<float>("LEFT_EYE_X") - rect.x(), t.file.get<float>("LEFT_EYE_Y") - rect.y())); 88 t.file.set("Affine_1", QPointF(t.file.get<float>("LEFT_EYE_X") - rect.x(), t.file.get<float>("LEFT_EYE_Y") - rect.y()));
  89 + t.file.set("First_Eye", t.file.get<QPointF>("Affine_0"));
  90 + t.file.set("Second_Eye", t.file.get<QPointF>("Affine_1"));
89 t.file.appendPoint(t.file.get<QPointF>("Affine_0")); 91 t.file.appendPoint(t.file.get<QPointF>("Affine_0"));
90 t.file.appendPoint(t.file.get<QPointF>("Affine_1")); 92 t.file.appendPoint(t.file.get<QPointF>("Affine_1"));
91 } 93 }