From c7e236c0f339fff13f37efe1db68bdb41c4e98c0 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Fri, 22 Feb 2013 16:00:49 -0500 Subject: [PATCH] Changed fatal to warning, added check in rectfromlandmarks function --- sdk/plugins/regions.cpp | 12 +++++++----- sdk/plugins/stasm.cpp | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk/plugins/regions.cpp b/sdk/plugins/regions.cpp index 98c3ce9..481ac22 100644 --- a/sdk/plugins/regions.cpp +++ b/sdk/plugins/regions.cpp @@ -156,11 +156,13 @@ class RectFromLandmarksTransform : public UntrainableTransform maxX = maxY = -std::numeric_limits::max(); foreach(int index, indices) { - if (src.file.landmarks()[index].x() < minX) minX = src.file.landmarks()[index].x(); - if (src.file.landmarks()[index].x() > maxX) maxX = src.file.landmarks()[index].x(); - if (src.file.landmarks()[index].y() < minY) minY = src.file.landmarks()[index].y(); - if (src.file.landmarks()[index].y() > maxY) maxY = src.file.landmarks()[index].y(); - dst.file.appendLandmark(src.file.landmarks()[index]); + if (src.file.landmarks().size() < index+1) { + if (src.file.landmarks()[index].x() < minX) minX = src.file.landmarks()[index].x(); + if (src.file.landmarks()[index].x() > maxX) maxX = src.file.landmarks()[index].x(); + if (src.file.landmarks()[index].y() < minY) minY = src.file.landmarks()[index].y(); + if (src.file.landmarks()[index].y() > maxY) maxY = src.file.landmarks()[index].y(); + dst.file.appendLandmark(src.file.landmarks()[index]); + } } double width = maxX-minX+padding; diff --git a/sdk/plugins/stasm.cpp b/sdk/plugins/stasm.cpp index 377fb60..fac064a 100644 --- a/sdk/plugins/stasm.cpp +++ b/sdk/plugins/stasm.cpp @@ -44,10 +44,10 @@ class StasmTransform : public UntrainableTransform int landmarks[500]; AsmSearchDll(&nlandmarks, landmarks, - src.file.name.toStdString().c_str(), reinterpret_cast(src.m().data), src.m().cols, src.m().rows, + qPrintable(src.file.name), reinterpret_cast(src.m().data), src.m().cols, src.m().rows, src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf")); - if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks"); + if (nlandmarks == 0) qWarning("Unable to detect Stasm landmarks"); dst = src; for (int i = 0; i < nlandmarks; i++) -- libgit2 0.21.4