diff --git a/openbr/plugins/algorithms.cpp b/openbr/plugins/algorithms.cpp index 0938740..a72b396 100644 --- a/openbr/plugins/algorithms.cpp +++ b/openbr/plugins/algorithms.cpp @@ -46,7 +46,7 @@ class AlgorithmsInitializer : public Initializer Globals->abbreviations.insert("CropFace", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.25,0.35)"); // Video - Globals->abbreviations.insert("DisplayVideo", "Stream([Cvt(Gray)+Resize(400,640)+Stasm+Delauney(true)+Draw(inPlace=true)+Show(false)+Discard])"); + Globals->abbreviations.insert("DisplayVideo", "Stream([Show(false)+Discard])"); Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false)+Discard])"); Globals->abbreviations.insert("AgeGenderDemo", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+Expand+++(+Rename(Subject,Age)+Discard)/(+Rename(Subject,Gender)+Discard)+RestoreMat(original)+Draw(inPlace=true)+DrawPropertiesPoint([Age,Gender],Affine_0,inPlace=true)+SaveMat(original)+Discard+Contract,RestoreMat(original)+FPSCalc+Show(false,[AvgFPS,Age,Gender])+Discard])"); diff --git a/openbr/plugins/landmarks.cpp b/openbr/plugins/landmarks.cpp index 2a26973..0870377 100644 --- a/openbr/plugins/landmarks.cpp +++ b/openbr/plugins/landmarks.cpp @@ -276,7 +276,7 @@ class DelaunayTransform : public UntrainableTransform bitwise_and(buffer,mask,output); - dst.m() += output; // Need to xor stuff out + dst.m() += output; } Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector()); @@ -295,7 +295,7 @@ BR_REGISTER(Transform, DelaunayTransform) /*! * \ingroup transforms - * \brief Wraps STASM key point detector + * \brief Computes the mean of a set of templates. Suitable for visualization only as it sets every projected template to the mean template. * \author Scott Klum \cite sklum */ class MeanTransform : public Transform @@ -308,13 +308,13 @@ class MeanTransform : public Transform { mean = Mat::zeros(data[0].m().rows,data[0].m().cols,CV_32F); - for (int i = 0; i < data.size()/2; i++) { + for (int i = 0; i < data.size(); i++) { Mat converted; data[i].m().convertTo(converted, CV_32F); mean += converted; } - mean /= data.size()/2; + mean /= data.size(); } void project(const Template &src, Template &dst) const