From 21d912646bfd1cc7027a9e02ce75381283b4a664 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Thu, 14 Nov 2013 13:47:50 -0500 Subject: [PATCH] Fixed type bug in OperationDistance --- openbr/plugins/distance.cpp | 4 ++-- openbr/plugins/validate.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbr/plugins/distance.cpp b/openbr/plugins/distance.cpp index 41548ac..7cf6bfd 100644 --- a/openbr/plugins/distance.cpp +++ b/openbr/plugins/distance.cpp @@ -213,10 +213,10 @@ private: switch (operation) { case Mean: - return std::accumulate(distances.begin(),distances.end(),0)/(float)distances.size(); + return std::accumulate(distances.begin(),distances.end(),0.0)/(float)distances.size(); break; case Sum: - return std::accumulate(distances.begin(),distances.end(),0); + return std::accumulate(distances.begin(),distances.end(),0.0); break; case Min: return *std::min_element(distances.begin(),distances.end()); diff --git a/openbr/plugins/validate.cpp b/openbr/plugins/validate.cpp index 280b969..0774565 100644 --- a/openbr/plugins/validate.cpp +++ b/openbr/plugins/validate.cpp @@ -255,7 +255,7 @@ class RejectDistance : public Distance { // We don't look at the query (void) b; - + foreach (const QString &key, keys) if ((rejectIfContains && a.file.contains(key)) || (!rejectIfContains && !a.file.contains(key))) return -std::numeric_limits::max(); -- libgit2 0.21.4