Revision: 7923
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7923&view=rev
Author: mdboom
Date: 2009-11-03 16:23:41 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
Remove conflict markers from last commit.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/collections.py
trunk/matplotlib/src/_backend_agg.cpp
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py 2009-11-03 16:21:36 UTC
(rev 7922)
+++ trunk/matplotlib/lib/matplotlib/collections.py 2009-11-03 16:23:41 UTC
(rev 7923)
@@ -574,7 +574,6 @@
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))])
@@ -586,19 +585,6 @@
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:
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp 2009-11-03 16:21:36 UTC (rev
7922)
+++ trunk/matplotlib/src/_backend_agg.cpp 2009-11-03 16:23:41 UTC (rev
7923)
@@ -163,17 +163,6 @@
_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");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
