Revision: 8821
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8821&view=rev
Author: mdboom
Date: 2010-12-09 19:06:03 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
Merged revisions 8819-8820 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
r8819 | mdboom | 2010-12-09 12:25:11 -0500 (Thu, 09 Dec 2010) | 2 lines
[3123736] tex processor crashes when fed a space
........
r8820 | mdboom | 2010-12-09 12:26:54 -0500 (Thu, 09 Dec 2010) | 2 lines
Fixed error message in Agg backend.
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/text.py
trunk/matplotlib/src/_backend_agg.cpp
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8817
/trunk/matplotlib:1-7315
+ /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8820
/trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py 2010-12-09 17:26:54 UTC (rev
8820)
+++ trunk/matplotlib/lib/matplotlib/text.py 2010-12-09 19:06:03 UTC (rev
8821)
@@ -551,6 +551,9 @@
if rcParams['text.usetex']:
for line, wh, x, y in info:
+ if not np.isfinite(x) or not np.isfinite(y):
+ continue
+
x = x + posx
y = y + posy
if renderer.flipy():
@@ -566,6 +569,9 @@
self._fontproperties, angle)
else:
for line, wh, x, y in info:
+ if not np.isfinite(x) or not np.isfinite(y):
+ continue
+
x = x + posx
y = y + posy
if renderer.flipy():
@@ -974,6 +980,8 @@
# Did we find an even number of non-escaped dollar signs?
# If so, treat is as math text.
if rcParams['text.usetex']:
+ if s == ' ':
+ s = r'\ '
return s, 'TeX'
if cbook.is_math_text(s):
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp 2010-12-09 17:26:54 UTC (rev
8820)
+++ trunk/matplotlib/src/_backend_agg.cpp 2010-12-09 19:06:03 UTC (rev
8821)
@@ -556,7 +556,7 @@
}
catch (Py::TypeError)
{
- throw Py::TypeError("Invalid input arguments to draw_text_image");
+ throw Py::TypeError("Invalid input arguments to restore_region2");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
