From 7dd634b3341a107073912a32d471e55d4a55b3b4 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Mon, 20 May 2013 14:29:21 -0400 Subject: [PATCH] fixed an intelligent gcc warning --- openbr/core/common.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openbr/core/common.h b/openbr/core/common.h index 2c6c57c..166ee45 100644 --- a/openbr/core/common.h +++ b/openbr/core/common.h @@ -153,11 +153,10 @@ void MeanStdDev(const V &vals, double *mean, double *stddev) template class C, typename T> T Median(C vals, T *q1 = 0, T *q3 = 0) { - if (vals.isEmpty()) return std::numeric_limits::quiet_NaN(); qSort(vals); - if (q1 != 0) *q1 = vals[1*vals.size()/4]; - if (q3 != 0) *q3 = vals[3*vals.size()/4]; - return vals[vals.size()/2]; + if (q1 != 0) *q1 = vals.isEmpty() ? 0 : vals[1*vals.size()/4]; + if (q3 != 0) *q3 = vals.isEmpty() ? 0 : vals[3*vals.size()/4]; + return vals.isEmpty() ? 0 : vals[vals.size()/2]; } /*! -- libgit2 0.21.4