SF.net SVN: matplotlib:[5980] trunk/matplotlib/src

[<ef...@us...>]

Revision: 5980
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5980&view=rev
Author:   efiring
Date:     2008-08-06 17:42:59 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Use MPL_notisfinite in place of MPL_isnan

Modified Paths:
--------------
    trunk/matplotlib/src/MPL_isnan.h
    trunk/matplotlib/src/agg_py_path_iterator.h

Modified: trunk/matplotlib/src/MPL_isnan.h
===================================================================
--- trunk/matplotlib/src/MPL_isnan.h	2008-08-06 12:50:31 UTC (rev 5979)
+++ trunk/matplotlib/src/MPL_isnan.h	2008-08-06 17:42:59 UTC (rev 5980)
@@ -69,3 +69,15 @@
   ( (( MPL_U64(u) & 0x7ff0000000000000i64) != 0x7ff0000000000000i64)) ? 1:0
 #endif
 #endif /* MPL_isfinite64 */
+
+#if !defined(MPL_notisfinite64)
+#if !defined(_MSC_VER)
+#define MPL_notisfinite64(u) \
+  ( (( MPL_U64(u) & 0x7ff0000000000000LL)  != 0x7ff0000000000000LL)) ? 0:1
+#else
+#define MPL_notisfinite64(u) \
+  ( (( MPL_U64(u) & 0x7ff0000000000000i64) != 0x7ff0000000000000i64)) ? 0:1
+#endif
+#endif /* MPL_notisfinite64 */
+
+

Modified: trunk/matplotlib/src/agg_py_path_iterator.h
===================================================================
--- trunk/matplotlib/src/agg_py_path_iterator.h	2008-08-06 12:50:31 UTC (rev 5979)
+++ trunk/matplotlib/src/agg_py_path_iterator.h	2008-08-06 17:42:59 UTC (rev 5980)
@@ -76,14 +76,14 @@
         if (m_iterator >= m_total_vertices) return agg::path_cmd_stop;
         unsigned code = vertex_with_code(m_iterator++, x, y);
 
-        if (MPL_isnan64(*x) || MPL_isnan64(*y)) {
+        if (MPL_notisfinite64(*x) || MPL_notisfinite64(*y)) {
             do {
                 if (m_iterator < m_total_vertices) {
                     vertex(m_iterator++, x, y);
                 } else {
                     return agg::path_cmd_stop;
                 }
-            } while (MPL_isnan64(*x) || MPL_isnan64(*y));
+            } while (MPL_notisfinite64(*x) || MPL_notisfinite64(*y));
             return agg::path_cmd_move_to;
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.