# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1252013338 14400
# Node ID 6f42ea240b3a679a9ad55d5ed983586899ac0db4
# Parent  bb36a5730ecc57532ba4e13ded666149306ace41
pr-output.cc (set_format (const Complex&, int&, int&)): avoid passing NaN or Inf to log10

diff -r bb36a5730ecc -r 6f42ea240b3a src/ChangeLog
--- a/src/ChangeLog	Thu Sep 03 17:24:06 2009 -0400
+++ b/src/ChangeLog	Thu Sep 03 17:28:58 2009 -0400
@@ -1,3 +1,8 @@
+2009-09-03  John W. Eaton  <jwe@octave.org>
+
+	* pr-output.cc (set_format (const Complex&, int&, int&)):
+	Avoid passing NaN or Inf to log10.
+
 2009-09-03  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov.cc (octave_value::assign (assign_op, const octave_value&)):
diff -r bb36a5730ecc -r 6f42ea240b3a src/pr-output.cc
--- a/src/pr-output.cc	Thu Sep 03 17:24:06 2009 -0400
+++ b/src/pr-output.cc	Thu Sep 03 17:28:58 2009 -0400
@@ -852,10 +852,10 @@
   double r_abs = rp < 0.0 ? -rp : rp;
   double i_abs = ip < 0.0 ? -ip : ip;
 
-  int r_x = r_abs == 0.0
+  int r_x = (xisinf (rp) || xisnan (rp) || xr_abs == 0.0)
     ? 0 : static_cast<int> (floor (log10 (r_abs) + 1.0));
 
-  int i_x = i_abs == 0.0
+  int i_x = (xisinf (ip) || xisnan (ip) || i_abs == 0.0)
     ? 0 : static_cast<int> (floor (log10 (i_abs) + 1.0));
 
   int x_max, x_min;