From: David Kastrup <dak@gnu.org>
Date: Mon, 29 Jun 2015 08:48:29 +0000 (+0200)
Subject: Robustify Offset::direction and Offset::length
X-Git-Tag: release/2.19.23-1~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f3f291c3c4411f9e73b59bfff94af0be60b43934;p=lilypond.git

Robustify Offset::direction and Offset::length
---

diff --git a/flower/offset.cc b/flower/offset.cc
index 0554e6b2e9..7cb2677481 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -90,8 +90,7 @@ Offset::angle_degrees () const
 Real
 Offset::length () const
 {
-  return sqrt (sqr (coordinate_a_[X_AXIS])
-               + sqr (coordinate_a_[Y_AXIS]));
+  return hypot (coordinate_a_[X_AXIS], coordinate_a_[Y_AXIS]);
 }
 
 bool
@@ -107,6 +106,17 @@ Offset
 Offset::direction () const
 {
   Offset d = *this;
+  if (isinf (d[X_AXIS]))
+    {
+      if (!isinf (d[Y_AXIS]))
+        return Offset ((d[X_AXIS] > 0.0 ? 1.0 : -1.0), 0.0);
+    }
+  else if (isinf (d[Y_AXIS]))
+    return Offset (0.0, (d[Y_AXIS] > 0.0 ? 1.0 : -1.0));
+  else if (d[X_AXIS] == 0.0 && d[Y_AXIS] == 0.0)
+    return d;
+  // The other cases propagate or produce NaN as appropriate.
+
   d /= length ();
   return d;
 }