use C++ std::isnan() instead of our own

astraw · astraw · commit 0bf1805b4de3 · 2007-07-13T22:27:33.000Z
svn path=/trunk/matplotlib/; revision=3518
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -23,7 +23,6 @@
 #include "_backend_agg.h"
 #include "_transforms.h"
 #include "mplutils.h"
-#include "MPL_isnan.h"
 
 #include "swig_runtime.h"
 
@@ -1585,7 +1584,7 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
         moveto = true;
         continue;
       }
-      if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) {
+      if (std::isnan(thisx) || std::isnan(thisy)) {
         moveto = true;
         continue;
       }
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -1,10 +1,11 @@
 #include <functional>
 #include <limits>
+#include <cmath>
+
 #include <math.h>
 
 #include "_transforms.h"
 #include "mplutils.h"
-#include "MPL_isnan.h"
 
 #include "numpy/arrayobject.h"
 
@@ -472,7 +473,7 @@ Bbox::update(const Py::Tuple &args) {
     tup = xys[i];
     double x = Py::Float(tup[0]);
     double y = Py::Float(tup[1]);
-    if (MPL_isnan64(x) || MPL_isnan64(y)) continue;
+    if (std::isnan(x) || std::isnan(y)) continue;
     _posx.update(x);
     _posy.update(y);
     if (x<minx) minx=x;
@@ -537,7 +538,7 @@ Bbox::update_numerix_xy(const Py::Tuple &args) {
   for (size_t i=0; i< Nxy; ++i) {
     thisx = *(double *)(xyin->data + i*xyin->strides[0]);
     thisy = *(double *)(xyin->data + i*xyin->strides[0] + xyin->strides[1]);
-    if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) continue;
+    if (std::isnan(thisx) || std::isnan(thisy)) continue;
     _posx.update(thisx);
     _posy.update(thisy);
     if (thisx<minx) minx=thisx;
@@ -611,7 +612,7 @@ Bbox::update_numerix(const Py::Tuple &args) {
   for (size_t i=0; i< Nx; ++i) {
     thisx = *(double *)(x->data + i*x->strides[0]);
     thisy = *(double *)(y->data + i*y->strides[0]);
-    if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) continue;
+    if (std::isnan(thisx) || std::isnan(thisy)) continue;
     _posx.update(thisx);
     _posy.update(thisy);
     if (thisx<minx) minx=thisx;
@@ -1253,12 +1254,12 @@ Transformation::nonlinear_only_numerix(const Py::Tuple & args, const Py::Dict &k
 
     double thisx = *(double *)(x->data + i*x->strides[0]);
     double thisy = *(double *)(y->data + i*y->strides[0]);
-    if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) {
+    if (std::isnan(thisx) || std::isnan(thisy)) {
       if (returnMask) {
 	*(unsigned char *)(retmask->data + i*retmask->strides[0]) = 0;
       }
       double MPLnan; // don't require C99 math features - find our own nan
-      if (MPL_isnan64(thisx)) {
+      if (std::isnan(thisx)) {
 	MPLnan=thisx;
       } else {
 	MPLnan=thisy;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`#include "_backend_agg.h"`
`24`	`24`	`#include "_transforms.h"`
`25`	`25`	`#include "mplutils.h"`
`26`		`-#include "MPL_isnan.h"`
`27`	`26`
`28`	`27`	`#include "swig_runtime.h"`
`29`	`28`
`@@ -1585,7 +1584,7 @@ RendererAgg::draw_lines(const Py::Tuple& args) {`
`1585`	`1584`	`moveto = true;`
`1586`	`1585`	`continue;`
`1587`	`1586`	`}`
`1588`		`- if (MPL_isnan64(thisx) \|\| MPL_isnan64(thisy)) {`
	`1587`	`+ if (std::isnan(thisx) \|\| std::isnan(thisy)) {`
`1589`	`1588`	`moveto = true;`
`1590`	`1589`	`continue;`
`1591`	`1590`	`}`