Revision: 8482
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8482&view=rev
Author: jdh2358
Date: 2010-07-02 17:22:49 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
added christophs dvipng_hack_alpha import fix
Modified Paths:
--------------
trunk/matplotlib/CXX/WrapPython.h
trunk/matplotlib/lib/matplotlib/texmanager.py
Modified: trunk/matplotlib/CXX/WrapPython.h
===================================================================
--- trunk/matplotlib/CXX/WrapPython.h 2010-07-01 18:24:00 UTC (rev 8481)
+++ trunk/matplotlib/CXX/WrapPython.h 2010-07-02 17:22:49 UTC (rev 8482)
@@ -44,11 +44,7 @@
#endif
// Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
-#if defined(__sun) || defined(sun)
-#if defined(_XPG4)
#undef _XPG4
-#endif
-#endif
// Python.h will redefine these and generate warning in the process
#undef _XOPEN_SOURCE
Modified: trunk/matplotlib/lib/matplotlib/texmanager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/texmanager.py 2010-07-01 18:24:00 UTC
(rev 8481)
+++ trunk/matplotlib/lib/matplotlib/texmanager.py 2010-07-02 17:22:49 UTC
(rev 8482)
@@ -91,7 +91,7 @@
if not os.path.exists(texcache):
os.mkdir(texcache)
- _dvipng_hack_alpha = dvipng_hack_alpha()
+ _dvipng_hack_alpha = None
# mappable cache of
rgba_arrayd = {}
@@ -516,8 +516,11 @@
if rcParams['text.dvipnghack'] is not None:
hack = rcParams['text.dvipnghack']
else:
+ if self._dvipng_hack_alpha is None:
+ self._dvipng_hack_alpha = dvipng_hack_alpha()
hack = self._dvipng_hack_alpha
+
if hack:
# hack the alpha channel
# dvipng assumed a constant background, whereas we want to
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
