Merged revisions 8819-8820 via svnmerge from

mdboom · mdboom · commit 7c7d909bb3e3 · 2010-12-09T19:06:03.000Z
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. ........ svn path=/trunk/matplotlib/; revision=8821
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -551,6 +551,9 @@ def draw(self, renderer):
 
         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 @@ def draw(self, renderer):
                                       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 @@ def is_math_text(s):
         # 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):
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -556,7 +556,7 @@ RendererAgg::restore_region2(const Py::Tuple& args)
     }
     catch (Py::TypeError)
     {
-        throw Py::TypeError("Invalid input arguments to draw_text_image");
+        throw Py::TypeError("Invalid input arguments to restore_region2");
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ RendererAgg::restore_region2(const Py::Tuple& args)`
`556`	`556`	`}`
`557`	`557`	`catch (Py::TypeError)`
`558`	`558`	`{`
`559`		`- throw Py::TypeError("Invalid input arguments to draw_text_image");`
	`559`	`+ throw Py::TypeError("Invalid input arguments to restore_region2");`
`560`	`560`	`}`
`561`	`561`
`562`	`562`