diff liboctave/CNDArray.cc @ 5387:5b00a8beb504

[project @ 2005-06-14 17:13:45 by jwe]
author jwe
date Tue, 14 Jun 2005 17:13:45 +0000
parents 4c8a2e4e0717
children 25c8956d2204
line wrap: on
line diff
--- a/liboctave/CNDArray.cc	Tue Jun 14 16:15:43 2005 +0000
+++ b/liboctave/CNDArray.cc	Tue Jun 14 17:13:45 2005 +0000
@@ -594,10 +594,10 @@
       double r_val = std::real (val);
       double i_val = std::imag (val);
 
-      if (r_val > FLT_MAX
-	  || i_val > FLT_MAX
-	  || r_val < FLT_MIN
-	  || i_val < FLT_MIN)
+      if ((! (octave_is_NaN_or_NA (r_val) || xisinf (r_val))
+	   && fabs (r_val) > FLT_MAX)
+	  || (! (octave_is_NaN_or_NA (i_val) || xisinf (i_val))
+	      && fabs (i_val) > FLT_MAX))
 	return true;
     }