Fix compilation issues on VS2003. (Thanks Martin Spacek)

mdboom · mdboom · commit 5cceb32c6095 · 2008-04-24T12:54:25.000Z
svn path=/trunk/matplotlib/; revision=5070
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-04-24 Fix compilation issues on VS2003 (Thanks Martin Spacek for
+           all the help) - MGD
+
 2008-04-24 Fix sub/superscripts when the size of the font has been
            changed - MGD
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -270,8 +270,8 @@ RendererAgg::set_clipbox(const Py::Object& cliprect, R rasterizer) {
 
   double l, b, r, t;
   if (py_convert_bbox(cliprect.ptr(), l, b, r, t)) {
-    rasterizer->clip_box(int(round(l)) + 1, height - int(round(b)),
-			 int(round(r)),     height - int(round(t)));
+    rasterizer->clip_box(int(mpl_round(l)) + 1, height - int(mpl_round(b)),
+			 int(mpl_round(r)),     height - int(mpl_round(t)));
   }
 
   _VERBOSE("RendererAgg::set_clipbox done");
@@ -807,7 +807,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
   if (gc.linewidth != 0.0) {
     double linewidth = gc.linewidth;
     if (!gc.isaa) {
-      linewidth = (linewidth < 0.5) ? 0.5 : round(linewidth);
+      linewidth = (linewidth < 0.5) ? 0.5 : mpl_round(linewidth);
     }
     if (gc.dashes.size() == 0) {
       stroke_t stroke(path);
@@ -1576,7 +1576,7 @@ RendererAgg::tostring_rgba_minimized(const Py::Tuple& args) {
   int newwidth = 0;
   int newheight = 0;
   Py::String data;
-  if (xmin < xmax and ymin < ymax) {
+  if (xmin < xmax && ymin < ymax) {
     // Expand the bounds by 1 pixel on all sides
     xmin = std::max(0, xmin - 1);
     ymin = std::max(0, ymin - 1);
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -6,12 +6,9 @@
 #include "numpy/arrayobject.h"
 #include "agg_path_storage.h"
 #include "MPL_isnan.h"
+#include "mplutils.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;
@@ -161,8 +158,8 @@ class SimplifyPath
             cmd = m_source->vertex(x, y);
             if (m_quantize && agg::is_vertex(cmd))
             {
-                *x = my_round(*x) + 0.5;
-                *y = my_round(*y) + 0.5;
+                *x = mpl_round(*x) + 0.5;
+                *y = mpl_round(*y) + 0.5;
             }
             return cmd;
         }
@@ -218,8 +215,8 @@ class SimplifyPath
             // Do any quantization if requested
             if (m_quantize && agg::is_vertex(cmd))
             {
-                *x = my_round(*x) + 0.5;
-                *y = my_round(*y) + 0.5;
+                *x = mpl_round(*x) + 0.5;
+                *y = mpl_round(*y) + 0.5;
             }
 
             //if we are starting a new path segment, move to the first point
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -1,4 +1,4 @@
-/* mplutils.h	-- 
+/* mplutils.h	--
  *
  * $Header$
  * $Log$
@@ -26,6 +26,10 @@ void _VERBOSE(const std::string&);
 #undef  MAX
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
+inline double mpl_round(double v) {
+  return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
+}
+
 class Printf
 {
 private :

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