Merged revisions 8902,8906,8908 via svnmerge from

efiring · efiring · commit 32f64b01c98d · 2011-01-12T19:23:28.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8902 | mdehoon | 2011-01-07 21:09:23 -1000 (Fri, 07 Jan 2011) | 2 lines Fixing a bug. Due to a race condition, the view of a closing window could get one release too many. ........ r8906 | efiring | 2011-01-11 21:53:37 -1000 (Tue, 11 Jan 2011) | 2 lines Fix eps distillation bbox bug; closes 3032385 ........ r8908 | efiring | 2011-01-11 22:14:53 -1000 (Tue, 11 Jan 2011) | 2 lines Add missing show() to example; patch by C. Gohlke; closes 3151545 ........ svn path=/trunk/matplotlib/; revision=8910
diff --git a/examples/api/quad_bezier.py b/examples/api/quad_bezier.py
@@ -16,5 +16,5 @@
 ax.plot([0.75], [0.25], "ro")
 ax.set_title('The red point should be on the path')
 
-plt.draw()
+plt.show()
 
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1363,7 +1363,8 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     operators. The output is low-level, converting text to outlines.
     """
 
-    paper_option = "-sPAPERSIZE=%s" % ptype
+    if eps: paper_option = "-dEPSCrop"
+    else: paper_option = "-sPAPERSIZE=%s" % ptype
 
     psfile = tmpfile + '.ps'
     outfile = tmpfile + '.output'
@@ -1385,14 +1386,6 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     shutil.move(psfile, tmpfile)
 
 
-    # While it is best if above steps preserve the original bounding
-    # box, it does not seems to be the case. pstoeps not only convert
-    # the input to eps format, but also restores the original bbox.
-
-    if eps:
-        pstoeps(tmpfile, bbox, rotated=rotated)
-
-
 def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     """
     Use ghostscript's ps2pdf and xpdf's/poppler's pdftops to distill a file.
@@ -1432,17 +1425,9 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     os.remove(tmpfile)
     shutil.move(psfile, tmpfile)
 
-
-    # Similar to the gs_distillier case, ps2pdf does not seem to
-    # preserve the bbox of the original file (at least w/ gs
-    # 8.61). Thus, the original bbox need to be resotred.
-
-    if eps:
-        pass
     for fname in glob.glob(tmpfile+'.*'):
         os.remove(fname)
 
-
 def get_bbox_header(lbrt, rotated=False):
     """
     return a postscript header stringfor the given bbox lbrt=(l, b, r, t).
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1904,7 +1904,7 @@ static int _find_minimum(CGFloat values[3])
         i = 2;
     return i;
 }
- 
+
 static int _find_maximum(CGFloat values[3])
 {
     int i = 0;
@@ -1918,7 +1918,7 @@ static int _find_maximum(CGFloat values[3])
         i = 2;
     return i;
 }
- 
+
 static void
 _rgba_color_evaluator(void* info, const CGFloat input[], CGFloat outputs[])
 {

Original file line number	Diff line number	Diff line change
`@@ -1904,7 +1904,7 @@ static int _find_minimum(CGFloat values[3])`
`1904`	`1904`	`i = 2;`
`1905`	`1905`	`return i;`
`1906`	`1906`	`}`
`1907`		`-`
	`1907`	`+`
`1908`	`1908`	`static int _find_maximum(CGFloat values[3])`
`1909`	`1909`	`{`
`1910`	`1910`	`int i = 0;`
`@@ -1918,7 +1918,7 @@ static int _find_maximum(CGFloat values[3])`
`1918`	`1918`	`i = 2;`
`1919`	`1919`	`return i;`
`1920`	`1920`	`}`
`1921`		`-`
	`1921`	`+`
`1922`	`1922`	`static void`
`1923`	`1923`	`_rgba_color_evaluator(void* info, const CGFloat input[], CGFloat outputs[])`
`1924`	`1924`	`{`