Use our own "round" function, since it doesn't appear to exist in VS2003

mdboom · mdboom · commit 048668b8e633 · 2008-04-23T12:37:58.000Z
svn path=/trunk/matplotlib/; revision=5064
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -8,6 +8,10 @@
 #include "MPL_isnan.h"
 #include <queue>
 
+static inline double my_round(double v) {
+  return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
+}
+
 class PathIterator
 {
     PyArrayObject* m_vertices;
@@ -157,8 +161,8 @@ class SimplifyPath
             cmd = m_source->vertex(x, y);
             if (m_quantize && agg::is_vertex(cmd))
             {
-                *x = round(*x) + 0.5;
-                *y = round(*y) + 0.5;
+                *x = my_round(*x) + 0.5;
+                *y = my_round(*y) + 0.5;
             }
             return cmd;
         }
@@ -214,8 +218,8 @@ class SimplifyPath
             // Do any quantization if requested
             if (m_quantize && agg::is_vertex(cmd))
             {
-                *x = round(*x) + 0.5;
-                *y = round(*y) + 0.5;
+                *x = my_round(*x) + 0.5;
+                *y = my_round(*y) + 0.5;
             }
 
             //if we are starting a new path segment, move to the first point

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@`
`8`	`8`	`#include "MPL_isnan.h"`
`9`	`9`	`#include <queue>`
`10`	`10`
	`11`	`+static inline double my_round(double v) {`
	`12`	`+ return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));`
	`13`	`+}`
	`14`	`+`
`11`	`15`	`class PathIterator`
`12`	`16`	`{`
`13`	`17`	`PyArrayObject* m_vertices;`
`@@ -157,8 +161,8 @@ class SimplifyPath`
`157`	`161`	`cmd = m_source->vertex(x, y);`
`158`	`162`	`if (m_quantize && agg::is_vertex(cmd))`
`159`	`163`	`{`
`160`		`- x = round(x) + 0.5;`
`161`		`- y = round(y) + 0.5;`
	`164`	`+ x = my_round(x) + 0.5;`
	`165`	`+ y = my_round(y) + 0.5;`
`162`	`166`	`}`
`163`	`167`	`return cmd;`
`164`	`168`	`}`
`@@ -214,8 +218,8 @@ class SimplifyPath`
`214`	`218`	`// Do any quantization if requested`
`215`	`219`	`if (m_quantize && agg::is_vertex(cmd))`
`216`	`220`	`{`
`217`		`- x = round(x) + 0.5;`
`218`		`- y = round(y) + 0.5;`
	`221`	`+ x = my_round(x) + 0.5;`
	`222`	`+ y = my_round(y) + 0.5;`
`219`	`223`	`}`
`220`	`224`
`221`	`225`	`//if we are starting a new path segment, move to the first point`