Merge changes from emacs-23 branch

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c4401c1c81e5bae1f7786fd50c53db75f1b35b1..2353116c8bd5116e4acb5791b31f651c69e7b9b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead
+       of int.  All uses adjusted.
+       (PNG_JMPBUF, png_load, jpeg_load, tiff_load, gif_load)
+       (svg_load_image): Remove casts.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+       * image.c (fn_png_longjmp, fn_png_set_longjmp_fn): New png
+       function definitions for compiling with libpng-1.5.
+       (PNG_LONGJMP, PNG_JMPBUF): New macros for libpng-1.5.
+       (my_png_error, png_load): Use them.  Suggested by Thomas Klausner
+       (Bug#7908).
+
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
 
        * s/ms-w32.h (HAVE_STRFTIME): Don't define.