Merged revisions 7813,7818-7819 via svnmerge from

jdh2358 · jdh2358 · commit 8398d9bd2c47 · 2009-09-24T04:02:07.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7813 | jdh2358 | 2009-09-21 12:12:47 -0500 (Mon, 21 Sep 2009) | 1 line tag for 0.99.1 release ........ r7818 | jdh2358 | 2009-09-23 22:00:28 -0500 (Wed, 23 Sep 2009) | 1 line try statically linking in the deps for OSX ........ r7819 | jdh2358 | 2009-09-23 22:57:31 -0500 (Wed, 23 Sep 2009) | 1 line applied a fix for sf bug 2865490; is there something more elegant? ........ svn path=/trunk/matplotlib/; revision=7821
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+===============================================
+2009-09-21 Tagged for release 0.99.1
+
 2009-09-20 Fix usetex spacing errors in pdf backend. - JKS
 
 2009-09-20 Add Sphinx extension to highlight IPython console sessions,
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -3,8 +3,11 @@ <h3>News</h3>
 
 <p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
 to support matplotlib development.</p>
- 
-<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>.  See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+
+<p>We have a release candidate of matplotlib 0.99.1 <a href="http://drop.io/xortel1">available</a> for testing.  Please report any problems on the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a> and  <a href="http://sourceforge.net/mail/?group_id=80706">mailing list</a>.
+</p>
+
+<p>matplotlib 0.99.0 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>.  See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
 pathto('users/installing') }}">installing</a>
 </p>
 
diff --git a/make.osx b/make.osx
@@ -1,7 +1,6 @@
 # build mpl into a local install dir with
 # PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
 
-MPLVERSION=0.99.1
 PYVERSION=2.6
 PYTHON=python${PYVERSION}
 ZLIBVERSION=1.2.3
@@ -92,6 +91,7 @@ binaries:
 	cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\
 	export CFLAGS=${CFLAGS} &&\
 	export LDFLAGS=${LDFLAGS} &&\
+	rm -f ${PREFIX}/lib/*.dylib &&\
 	/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
 	hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg  dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
 	${PYTHON} setupegg.py bdist_egg
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -608,6 +608,14 @@ RendererAgg::draw_markers(const Py::Tuple& args) {
 
         x = (double)(int)x; y = (double)(int)y;
 
+	// if x or y is close to the width or height, the filled
+	// region could be inside the boundary even if the center is
+	// out.  But at some point we need to cull these points
+	// because they can create segfaults of they overflow; eg
+	// https://sourceforge.net/tracker/?func=detail&aid=2865490&group_id=80706&atid=560720
+	if (fabs(x)>(2*width)) continue;
+	if (fabs(y)>(2*height)) continue;
+
 	pixfmt_amask_type pfa(pixFmt, alphaMask);
 	amask_ren_type r(pfa);
 	amask_aa_renderer_type ren(r);
@@ -629,6 +637,14 @@ RendererAgg::draw_markers(const Py::Tuple& args) {
 
         x = (double)(int)x; y = (double)(int)y;
 
+	// if x or y is close to the width or height, the filled
+	// region could be inside the boundary even if the center is
+	// out.  But at some point we need to cull these points
+	// because they can create segfaults of they overflow; eg
+	// https://sourceforge.net/tracker/?func=detail&aid=2865490&group_id=80706&atid=560720
+	if (fabs(x)>(2*width)) continue;
+	if (fabs(y)>(2*height)) continue;
+
 	if (face.first) {
 	  rendererAA.color(face.second);
 	  sa.init(fillCache, fillSize, x, y);
