From 9a9a279b3400c553f860d1941fe45f39bf0dbaab Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Sat, 9 Feb 2013 16:09:21 -0500 Subject: [PATCH] rr output logic fix --- sdk/plugins/output.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/plugins/output.cpp b/sdk/plugins/output.cpp index 3655fcb..af90b1e 100644 --- a/sdk/plugins/output.cpp +++ b/sdk/plugins/output.cpp @@ -168,7 +168,6 @@ class rrOutput : public MatrixOutput const int limit = file.getInt("limit", 20); const bool flat = file.getBool("flat"); const bool index = file.getBool("index"); - const bool score = file.getBool("score"); const bool invert = file.getBool("invert"); const bool metadata = file.getBool("metadata"); const float threshold = file.getFloat("threshold", -std::numeric_limits::max()); @@ -182,8 +181,10 @@ class rrOutput : public MatrixOutput foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), !invert).mid(0, limit)) { if (pair.first < threshold) break; QString output; - if (score) targetFiles[pair.second].set("Score", QString::number(pair.first)); - if (metadata) output.append(targetFiles[pair.second].flat()); + if (metadata) { + targetFiles[pair.second].set("Score", QString::number(pair.first)); + output.append(targetFiles[pair.second].flat()); + } else output.append(index ? QString::number(pair.second) : targetFiles[pair.second].name); files.append(output); } -- libgit2 0.21.4