Fix problem with NaNs at end of path.

mdboom · mdboom · commit 0c7673690beb · 2008-07-17T17:40:47.000Z
svn path=/trunk/matplotlib/; revision=5775
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-07-17 Fix bug with NaNs at end of path (thanks, Andrew Straw for
+           the report) - MGD
+
 2008-07-12 Added support for external backends with the
            "module://my_backend" syntax - JDH
 
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -75,11 +75,13 @@ class PathIterator
     {
         if (m_iterator >= m_total_vertices) return agg::path_cmd_stop;
         unsigned code = vertex_with_code(m_iterator++, x, y);
-        while ((MPL_isnan64(*x) || MPL_isnan64(*y)) &&
-                m_iterator < m_total_vertices)
-        {
+        if (MPL_isnan64(*x) || MPL_isnan64(*y)) {
+          do {
             vertex(m_iterator++, x, y);
-            code = agg::path_cmd_move_to;
+          } while ((MPL_isnan64(*x) || MPL_isnan64(*y)) &&
+                   m_iterator < m_total_vertices);
+          return (m_iterator >= m_total_vertices) ? agg::path_cmd_stop :
+                                                    agg::path_cmd_move_to;
         }
         return code;
     }

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,13 @@ class PathIterator`
`75`	`75`	`{`
`76`	`76`	`if (m_iterator >= m_total_vertices) return agg::path_cmd_stop;`
`77`	`77`	`unsigned code = vertex_with_code(m_iterator++, x, y);`
`78`		`- while ((MPL_isnan64(x) \|\| MPL_isnan64(y)) &&`
`79`		`- m_iterator < m_total_vertices)`
`80`		`- {`
	`78`	`+ if (MPL_isnan64(x) \|\| MPL_isnan64(y)) {`
	`79`	`+ do {`
`81`	`80`	`vertex(m_iterator++, x, y);`
`82`		`- code = agg::path_cmd_move_to;`
	`81`	`+ } while ((MPL_isnan64(x) \|\| MPL_isnan64(y)) &&`
	`82`	`+ m_iterator < m_total_vertices);`
	`83`	`+ return (m_iterator >= m_total_vertices) ? agg::path_cmd_stop :`
	`84`	`+ agg::path_cmd_move_to;`
`83`	`85`	`}`
`84`	`86`	`return code;`
`85`	`87`	`}`