Peter M. Groen / openbr

Commit 48aec2e87b85999d7e3affae477fa186adf32f34

Authored by Scott Klum
1 parent 8b5142ec

Fixed example stream algorithms

Inline Side-by-side
Showing 2 changed files with 2 additions and 4 deletions
openbr/plugins/algorithms.cpp
  View file @48aec2e
... ... @@ -46,8 +46,8 @@ class AlgorithmsInitializer : public Initializer
46 46 Globals->abbreviations.insert("CropFace", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.25,0.35)");
47 47  
48 48 // Video
49   - Globals->abbreviations.insert("DisplayVideo", "Stream([Show(false)+Discard])");
50   - Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false)+Discard])");
  49 + Globals->abbreviations.insert("DisplayVideo", "Stream([Show(false,[FrameNumber])+Discard])");
  50 + Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false,[FrameNumber])+Discard])");
51 51 Globals->abbreviations.insert("AgeGenderDemo", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+Expand+<FaceClassificationRegistration>+<FaceClassificationExtraction>+(<AgeRegressor>+Rename(Subject,Age)+Discard)/(<GenderClassifier>+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])");
52 52  
53 53 // Generic Image Processing
... ...
openbr/plugins/regions.cpp
  View file @48aec2e
... ... @@ -239,7 +239,6 @@ BR_REGISTER(Transform, ExpandRectTransform)
239 239 * \ingroup transforms
240 240 * \brief Crops the width and height of a template's rects by input width and height factors.
241 241 * \author Scott Klum \cite sklum
242   - * \todo Error checking
243 242 */
244 243 class CropRectTransform : public UntrainableTransform
245 244 {
... ... @@ -257,7 +256,6 @@ class CropRectTransform : public UntrainableTransform
257 256 for (int i=0;i < rects.size(); i++) {
258 257 QRectF rect = rects[i];
259 258  
260   - // Do a bit of error checking
261 259 rect.setX(rect.x() + rect.width() * QtUtils::toPoint(widthCrop).x());
262 260 rect.setY(rect.y() + rect.height() * QtUtils::toPoint(heightCrop).x());
263 261 rect.setWidth(rect.width() * (1-QtUtils::toPoint(widthCrop).y()));
... ...