Revision: 8737
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8737&view=rev
Author: mdboom
Date: 2010-10-08 18:16:54 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
Merged revisions 8736 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
r8736 | mdboom | 2010-10-08 14:16:15 -0400 (Fri, 08 Oct 2010) | 2 lines
[3082058] build _png.so on aix
........
Modified Paths:
--------------
trunk/matplotlib/src/_png.cpp
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /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-8734
+ /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8736
/trunk/matplotlib:1-7315
Modified: trunk/matplotlib/src/_png.cpp
===================================================================
--- trunk/matplotlib/src/_png.cpp 2010-10-08 18:16:15 UTC (rev 8736)
+++ trunk/matplotlib/src/_png.cpp 2010-10-08 18:16:54 UTC (rev 8737)
@@ -27,6 +27,11 @@
#include "numpy/arrayobject.h"
#include "mplutils.h"
+// As reported in [3082058] build _png.so on aix
+#ifdef _AIX
+#undef jmpbuf
+#endif
+
// the extension module
class _png_module : public Py::ExtensionModule<_png_module>
{
@@ -163,7 +168,7 @@
throw Py::RuntimeError("Could not create info struct");
}
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
throw Py::RuntimeError("Error building image");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
