Merged revisions 7919 via svnmerge from

mdboom · mdboom · commit f645f42ffb9b · 2009-11-03T16:21:36.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7919 | mdboom | 2009-11-03 10:46:14 -0500 (Tue, 03 Nov 2009) | 2 lines [2890979] Close paths correctly in PolyCollection ........ svn path=/trunk/matplotlib/; revision=7922
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -574,6 +574,7 @@ def set_verts(self, verts, closed=True):
         if closed:
             self._paths = []
             for xy in verts:
+<<<<<<< .working
                 if len(xy):
                     if np.ma.isMaskedArray(xy):
                         xy = np.ma.concatenate([xy, np.zeros((1,2))])
@@ -585,6 +586,19 @@ def set_verts(self, verts, closed=True):
                     codes[0] = mpath.Path.MOVETO
                     codes[-1] = mpath.Path.CLOSEPOLY
                     self._paths.append(mpath.Path(xy, codes))
+=======
+                if len(xy):
+                    if np.ma.isMaskedArray(xy):
+                        xy = np.ma.concatenate([xy, np.zeros((1,2))])
+                    else:
+                        xy = np.asarray(xy)
+                        xy = np.concatenate([xy, np.zeros((1,2))])
+                    codes = np.empty(xy.shape[0], dtype='uint8')
+                    codes[:] = mpath.Path.LINETO
+                    codes[0] = mpath.Path.MOVETO
+                    codes[-1] = mpath.Path.CLOSEPOLY
+                    self._paths.append(mpath.Path(xy, codes))
+>>>>>>> .merge-right.r7919
                 else:
                     self._paths.append(mpath.Path(xy))
         else:
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -163,6 +163,17 @@ GCAgg::GCAgg(const Py::Object &gc, double dpi) :
   _set_hatch_path(gc);
 }
 
+<<<<<<< .working
+=======
+GCAgg::GCAgg(double dpi) :
+  dpi(dpi), isaa(true),
+  cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0),
+  dashOffset(0.0)
+{
+
+}
+
+>>>>>>> .merge-right.r7919
 void
 GCAgg::_set_antialiased(const Py::Object& gc) {
   _VERBOSE("GCAgg::antialiased");
