Merge pull request #4527 from mdboom/stdlib-isfinit

efiring · efiring · commit b57e014081b4 · 2015-06-22T06:39:47.000-10:00
Use C++ stdlib for isfinite etc.
diff --git a/src/MPL_isnan.h b/src/MPL_isnan.h
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -4,7 +4,6 @@
 
 #include "_backend_agg.h"
 #include "mplutils.h"
-#include "MPL_isnan.h"
 
 void BufferRegion::to_string_argb(uint8_t *buf)
 {
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -6,6 +6,7 @@
 #ifndef __BACKEND_AGG_H__
 #define __BACKEND_AGG_H__
 
+#include <cmath>
 #include <vector>
 
 #include "agg_alpha_mask_u8.h"
@@ -597,7 +598,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc,
 
         if (has_clippath) {
             while (path_curve.vertex(&x, &y) != agg::path_cmd_stop) {
-                if (MPL_notisfinite64(x) || MPL_notisfinite64(y)) {
+                if (!(std::isfinite(x) && std::isfinite(y))) {
                     continue;
                 }
 
@@ -629,7 +630,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc,
             }
         } else {
             while (path_curve.vertex(&x, &y) != agg::path_cmd_stop) {
-                if (MPL_notisfinite64(x) || MPL_notisfinite64(y)) {
+                if (!(std::isfinite(x) && std::isfinite(y))) {
                     continue;
                 }
 
diff --git a/src/_path.h b/src/_path.h
@@ -6,6 +6,7 @@
 #include <limits>
 #include <math.h>
 #include <vector>
+#include <cmath>
 
 #include "agg_conv_contour.h"
 #include "agg_conv_curve.h"
@@ -102,7 +103,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
         for (i = 0; i < n; ++i) {
             ty = points[i][1];
 
-            if (MPL_isfinite64(ty)) {
+            if (std::isfinite(ty)) {
                 // get test bit for above/below X axis
                 yflag0[i] = (vty0 >= ty);
 
@@ -126,7 +127,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
                 tx = points[i][0];
                 ty = points[i][1];
 
-                if (MPL_notisfinite64(tx) || MPL_notisfinite64(ty)) {
+                if (!(std::isfinite(tx) && std::isfinite(ty))) {
                     continue;
                 }
 
@@ -174,7 +175,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
             tx = points[i][0];
             ty = points[i][1];
 
-            if (MPL_notisfinite64(tx) || MPL_notisfinite64(ty)) {
+            if (!(std::isfinite(tx) && std::isfinite(ty))) {
                 continue;
             }
 
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -3,9 +3,9 @@
 #ifndef __PATH_CONVERTERS_H__
 #define __PATH_CONVERTERS_H__
 
+#include <cmath>
 #include "agg_path_storage.h"
 #include "agg_clip_liang_barsky.h"
-#include "MPL_isnan.h"
 #include "mplutils.h"
 #include "agg_conv_segmentator.h"
 
@@ -176,14 +176,14 @@ class PathNanRemover : protected EmbeddedQueue<4>
                 }
 
                 size_t num_extra_points = num_extra_points_map[code & 0xF];
-                bool has_nan = (MPL_notisfinite64(*x) || MPL_notisfinite64(*y));
+                bool has_nan = (!(std::isfinite(*x) && std::isfinite(*y)));
                 queue_push(code, *x, *y);
 
                 /* Note: this test can not be short-circuited, since we need to
                    advance through the entire curve no matter what */
                 for (size_t i = 0; i < num_extra_points; ++i) {
                     m_source->vertex(x, y);
-                    has_nan = has_nan || (MPL_notisfinite64(*x) || MPL_notisfinite64(*y));
+                    has_nan = has_nan || !(std::isfinite(*x) && std::isfinite(*y));
                     queue_push(code, *x, *y);
                 }
 
@@ -196,7 +196,7 @@ class PathNanRemover : protected EmbeddedQueue<4>
                 /* If the last point is finite, we use that for the
                    moveto, otherwise, we'll use the first vertex of
                    the next curve. */
-                if (!(MPL_notisfinite64(*x) || MPL_notisfinite64(*y))) {
+                if (std::isfinite(*x) && std::isfinite(*y)) {
                     queue_push(agg::path_cmd_move_to, *x, *y);
                     needs_move_to = false;
                 } else {
@@ -219,14 +219,14 @@ class PathNanRemover : protected EmbeddedQueue<4>
                 return code;
             }
 
-            if (MPL_notisfinite64(*x) || MPL_notisfinite64(*y)) {
+            if (!(std::isfinite(*x) && std::isfinite(*y))) {
                 do {
                     code = m_source->vertex(x, y);
                     if (code == agg::path_cmd_stop ||
                         code == (agg::path_cmd_end_poly | agg::path_flags_close)) {
                         return code;
                     }
-                } while (MPL_notisfinite64(*x) || MPL_notisfinite64(*y));
+                } while (!(std::isfinite(*x) && std::isfinite(*y)));
                 return agg::path_cmd_move_to;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`#include "_backend_agg.h"`
`6`	`6`	`#include "mplutils.h"`
`7`		`-#include "MPL_isnan.h"`
`8`	`7`
`9`	`8`	`void BufferRegion::to_string_argb(uint8_t *buf)`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#ifndef __BACKEND_AGG_H__`
`7`	`7`	`#define __BACKEND_AGG_H__`
`8`	`8`
	`9`	`+#include <cmath>`
`9`	`10`	`#include <vector>`
`10`	`11`
`11`	`12`	`#include "agg_alpha_mask_u8.h"`
`@@ -597,7 +598,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc,`
`597`	`598`
`598`	`599`	`if (has_clippath) {`
`599`	`600`	`while (path_curve.vertex(&x, &y) != agg::path_cmd_stop) {`
`600`		`- if (MPL_notisfinite64(x) \|\| MPL_notisfinite64(y)) {`
	`601`	`+ if (!(std::isfinite(x) && std::isfinite(y))) {`
`601`	`602`	`continue;`
`602`	`603`	`}`
`603`	`604`
`@@ -629,7 +630,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc,`
`629`	`630`	`}`
`630`	`631`	`} else {`
`631`	`632`	`while (path_curve.vertex(&x, &y) != agg::path_cmd_stop) {`
`632`		`- if (MPL_notisfinite64(x) \|\| MPL_notisfinite64(y)) {`
	`633`	`+ if (!(std::isfinite(x) && std::isfinite(y))) {`
`633`	`634`	`continue;`
`634`	`635`	`}`
`635`	`636`