orthanc: Core/DicomParsing/DicomWebJsonVisitor.cpp comparison

fix

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 26 Feb 2019 16:42:21 +0100
parents	4be505c2ac56
children	eb57b7cd5f21

comparison

equal deleted inserted replaced

-:f2f8aa6f78aa
+:b88937ef597b
 }
 Json::Value DicomWebJsonVisitor::FormatDouble(double value)
 {
-long long a = boost::math::llround<double>(value);
+try
+{
-double d = fabs(value - static_cast<double>(a));
+long long a = boost::math::llround<double>(value);
-if (d <= std::numeric_limits<double>::epsilon() * 100.0)
+double d = fabs(value - static_cast<double>(a));
-{
-return FormatInteger(a);
+if (d <= std::numeric_limits<double>::epsilon() * 100.0)
-}
+{
-else
+return FormatInteger(a);
-{
+}
+else
+{
+return Json::Value(value);
+}
+}
+catch (boost::math::rounding_error&)
+{
+// Can occur if "long long" is too small to receive this value
+// (e.g. infinity)
 return Json::Value(value);
 }
 }

Mercurial > hg > orthanc