Minor speed improvements in Agg backend.

mdboom · mdboom · commit 3e1705acc8af · 2008-01-23T14:35:21.000Z
svn path=/trunk/matplotlib/; revision=4888
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -343,6 +343,10 @@ bool should_snap(Path& path, const agg::trans_affine& trans) {
     return false;
 
   code = path.vertex(&x0, &y0);
+  if (code == agg::path_cmd_stop) {
+    path.rewind(0);
+    return false;
+  }
   trans.transform(&x0, &y0);
 
   while ((code = path.vertex(&x1, &y1)) != agg::path_cmd_stop) {
@@ -1602,7 +1606,6 @@ RendererAgg::rgb_to_color(const Py::SeqBase<Py::Object>& rgb, double alpha) {
   double g = Py::Float(rgb[1]);
   double b = Py::Float(rgb[2]);
   return agg::rgba(r, g, b, alpha);
-
 }
 
 
@@ -1615,8 +1618,6 @@ RendererAgg::points_to_pixels_snapto(const Py::Object& points) {
   double p = Py::Float( points ) ;
   //return (int)(p*PIXELS_PER_INCH/72.0*dpi/72.0)+0.5;
   return (int)(p*dpi/72.0)+0.5;
-
-
 }
 
 double
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -118,7 +118,7 @@ class SimplifyPath
     SimplifyPath(VertexSource& source, bool quantize, bool simplify,
                  double width = 0.0, double height = 0.0) :
             m_source(&source), m_quantize(quantize), m_simplify(simplify),
-            m_width(width), m_height(height), m_queue_read(0), m_queue_write(0),
+            m_width(width + 1.0), m_height(height + 1.0), m_queue_read(0), m_queue_write(0),
             m_moveto(true), m_lastx(0.0), m_lasty(0.0), m_clipped(false),
             m_do_clipping(width > 0.0 && height > 0.0),
             m_origdx(0.0), m_origdy(0.0),
@@ -246,9 +246,9 @@ class SimplifyPath
             //could be clipped, but a more involved calculation would be needed
             if (m_do_clipping &&
                 ((*x < -1.0 && m_lastx < -1.0) ||
-                 (*x > m_width + 1.0 && m_lastx > m_width + 1.0) ||
+                 (*x > m_width && m_lastx > m_width) ||
                  (*y < -1.0 && m_lasty < -1.0) ||
-                 (*y > m_height + 1.0 && m_lasty > m_height + 1.0)))
+                 (*y > m_height && m_lasty > m_height)))
             {
                 m_lastx = *x;
                 m_lasty = *y;
