Peter M. Groen / openbr

Commit 7dd634b3341a107073912a32d471e55d4a55b3b4

Authored by Josh Klontz
1 parent bd9fa383

fixed an intelligent gcc warning

Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
openbr/core/common.h
  View file @7dd634b
@@ -153,11 +153,10 @@ void MeanStdDev(const V<T> &vals, double *mean, double *stddev) @@ -153,11 +153,10 @@ void MeanStdDev(const V<T> &vals, double *mean, double *stddev)
153 template<template<typename> class C, typename T> 153 template<template<typename> class C, typename T>
154 T Median(C<T> vals, T *q1 = 0, T *q3 = 0) 154 T Median(C<T> vals, T *q1 = 0, T *q3 = 0)
155 { 155 {
156 - if (vals.isEmpty()) return std::numeric_limits<float>::quiet_NaN();  
157 qSort(vals); 156 qSort(vals);
158 - if (q1 != 0) *q1 = vals[1*vals.size()/4];  
159 - if (q3 != 0) *q3 = vals[3*vals.size()/4];  
160 - return vals[vals.size()/2]; 157 + if (q1 != 0) *q1 = vals.isEmpty() ? 0 : vals[1*vals.size()/4];
  158 + if (q3 != 0) *q3 = vals.isEmpty() ? 0 : vals[3*vals.size()/4];
  159 + return vals.isEmpty() ? 0 : vals[vals.size()/2];
161 } 160 }
162 161
163 /*! 162 /*!