Merged revisions 8092,8116 via svnmerge from

mdboom · mdboom · commit 472ca7f1bffe · 2010-02-08T16:00:23.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r8092 | leejjoon | 2010-01-18 19:26:16 -0500 (Mon, 18 Jan 2010) | 1 line update annotate documentation to explain *annotation_clip* parameter ........ r8116 | mdboom | 2010-02-08 10:57:45 -0500 (Mon, 08 Feb 2010) | 1 line Fix for libpng-1.4 compatibility ........ svn path=/trunk/matplotlib/; revision=8117
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1668,6 +1668,14 @@ def __init__(self, s, xy,
           # 5 points below the top border
           xy=(10,-5), xycoords='axes points'
 
+
+        The *annotation_clip* attribute contols the visibility of the
+        annotation when it goes outside the axes area. If True, the
+        annotation will only be drawn when the *xy* is inside the
+        axes. If False, the annotation will always be drawn regardless
+        of its position.  The default is *None*, which behave as True
+        only if *xycoords* is"data".
+
         Additional kwargs are Text properties:
 
         %(Text)s
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -336,7 +336,11 @@ _png_module::read_png(const Py::Tuple& args) {
 
   //free the png memory
   png_read_end(png_ptr, info_ptr);
+#ifndef png_infopp_NULL
+  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+#else
   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+#endif
   if (close_file) {
     fclose(fp);
   }
