Merge remote-tracking branch 'origin/v1.1.x'

mdboom · mdboom · commit 6e5950d21a9f · 2012-01-23T11:53:28.000-05:00
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -127,6 +127,8 @@ def convert_path(ctx, path, transform):
         for points, code in path.iter_segments(transform):
             if code == Path.MOVETO:
                 ctx.move_to(*points)
+            elif code == Path.CLOSEPOLY:
+                ctx.close_path()
             elif code == Path.LINETO:
                 ctx.line_to(*points)
             elif code == Path.CURVE3:
@@ -135,8 +137,6 @@ def convert_path(ctx, path, transform):
                              points[2], points[3])
             elif code == Path.CURVE4:
                 ctx.curve_to(*points)
-            elif code == Path.CLOSEPOLY:
-                ctx.close_path()
 
 
     def draw_path(self, gc, path, transform, rgbFace=None):
diff --git a/lib/matplotlib/backends/backend_emf.py b/lib/matplotlib/backends/backend_emf.py
@@ -234,15 +234,15 @@ def convert_path(self, tpath):
         for points, code in tpath.iter_segments():
             if code == Path.MOVETO:
                 self.emf.MoveTo(*points)
+            elif code == Path.CLOSEPOLY:
+                self.emf.CloseFigure()
             elif code == Path.LINETO:
                 self.emf.LineTo(*points)
             elif code == Path.CURVE3:
                 points = quad2cubic(*(list(last_points[-2:]) + list(points)))
                 self.emf.PolyBezierTo(zip(points[2::2], points[3::2]))
             elif code == Path.CURVE4:
                 self.emf.PolyBezierTo(zip(points[::2], points[1::2]))
-            elif code == Path.CLOSEPOLY:
-                self.emf.CloseFigure()
             last_points = points
         self.emf.EndPath()
 
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1263,6 +1263,8 @@ def pathOperations(path, transform, clip=None, simplify=None):
                 # This is allowed anywhere in the path
                 cmds.extend(points)
                 cmds.append(Op.moveto)
+            elif code == Path.CLOSEPOLY:
+                cmds.append(Op.closepath)
             elif last_points is None:
                 # The other operations require a previous point
                 raise ValueError('Path lacks initial MOVETO')
@@ -1276,8 +1278,6 @@ def pathOperations(path, transform, clip=None, simplify=None):
             elif code == Path.CURVE4:
                 cmds.extend(points)
                 cmds.append(Op.curveto)
-            elif code == Path.CLOSEPOLY:
-                cmds.append(Op.closepath)
             last_points = points
         return cmds
 
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -533,6 +533,11 @@ def _convert_path(self, path, transform, clip=False, simplify=None):
                                                simplify=simplify):
             if code == Path.MOVETO:
                 ps.append("%g %g m" % tuple(points))
+            elif code == Path.CLOSEPOLY:
+                ps.append("cl")
+            elif last_points is None:
+                # The other operations require a previous point
+                raise ValueError('Path lacks initial MOVETO')
             elif code == Path.LINETO:
                 ps.append("%g %g l" % tuple(points))
             elif code == Path.CURVE3:
@@ -541,8 +546,6 @@ def _convert_path(self, path, transform, clip=False, simplify=None):
                           tuple(points[2:]))
             elif code == Path.CURVE4:
                 ps.append("%g %g %g %g %g %g c" % tuple(points))
-            elif code == Path.CLOSEPOLY:
-                ps.append("cl")
             last_points = points
 
         ps = "\n".join(ps)
