From f7f0dac1b6d2810b8ed6a777bfc38f75acb616bd Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Sun, 24 Mar 2013 14:49:56 -0400 Subject: [PATCH] Simmat/mask error output fix --- openbr/core/plot.cpp | 2 +- openbr/plugins/stasm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp index 5b0809b..c3056fb 100644 --- a/openbr/core/plot.cpp +++ b/openbr/core/plot.cpp @@ -122,7 +122,7 @@ float Evaluate(const QString &simmat, const QString &mask, const QString &csv) maskFile.set("rows", scores.rows); maskFile.set("columns", scores.cols); const Mat masks = BEE::readMask(maskFile); - if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch."); + if (scores.size() != masks.size()) qFatal("Simmat (%i,%i) / Mask (%i,%i) size mismatch.", scores.rows, scores.cols, masks.rows, masks.cols); // Make comparisons QList comparisons; comparisons.reserve(scores.rows*scores.cols); diff --git a/openbr/plugins/stasm.cpp b/openbr/plugins/stasm.cpp index 4a608f2..6a386cc 100644 --- a/openbr/plugins/stasm.cpp +++ b/openbr/plugins/stasm.cpp @@ -22,7 +22,7 @@ class StasmInitializer : public Initializer Globals->abbreviations.insert("RectFromStasmJaw","RectFromPoints([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],10)"); Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],0.25,6.5)+Resize(44,230)"); Globals->abbreviations.insert("RectFromStasmNose","RectFromPoints([38, 39, 40, 41, 42, 43, 44, 67],0.1,1.5)+Resize(44,44)"); - Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(44,110)"); + Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66],0.3,3.0)+Resize(26,68)"); } }; -- libgit2 0.21.4