added the renderer dpi to the cache key for text

jdh2358 · jdh2358 · commit 54cbf33c1281 · 2008-09-17T01:54:56.000Z
svn path=/trunk/matplotlib/; revision=6098
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -955,7 +955,7 @@ def findfont(self, prop, fontext='ttf'):
         fname = prop.get_file()
         if fname is not None:
             verbose.report('findfont returning %s'%fname, 'debug')
-            return fname[0]
+            return fname
 
         if fontext == 'afm':
             fontdict = self.afmdict
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -401,7 +401,7 @@ def get_prop_tup(self):
         return (x, y, self._text, self._color,
                 self._verticalalignment, self._horizontalalignment,
                 hash(self._fontproperties), self._rotation,
-                self.figure.dpi, id(self._renderer)
+                self.figure.dpi, id(self._renderer), self._renderer.dpi
                 )
 
     def get_text(self):

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ def get_prop_tup(self):`
`401`	`401`	`return (x, y, self._text, self._color,`
`402`	`402`	`self._verticalalignment, self._horizontalalignment,`
`403`	`403`	`hash(self._fontproperties), self._rotation,`
`404`		`- self.figure.dpi, id(self._renderer)`
	`404`	`+ self.figure.dpi, id(self._renderer), self._renderer.dpi`
`405`	`405`	`)`
`406`	`406`
`407`	`407`	`def get_text(self):`