diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-12-31 14:38:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-12-31 14:38:06 +0200 |
| commit | 5be1c984b7839d528cf9e83c68b9055c29bed751 (patch) | |
| tree | bd7d1c8021a0f2b48edb6e58beb3ce195cbea162 /nt | |
| parent | 89dc29d9c8e7957d047e9e9abe95334d70982814 (diff) | |
| download | emacs-5be1c984b7839d528cf9e83c68b9055c29bed751.tar.gz | |
Fix bug #7716 with PNG image support libraries on Windows.
src/image.c <Qlibpng_version>: New variable.
(syms_of_image): Intern and staticpro it. Set its value to the
version of PNG library we were compiled with.
(my_png_error, png_load): Avoid GCC warnings about direct access
to png_ptr->jmpbuf.
lisp/term/w32-win.el (image-library-alist): Set up correctly for
libpng versions both before and after 1.4.0.
admin/nt/README.W32: Update the information about PNG support libraries.
nt/INSTALL: Update the information about PNG support libraries.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/INSTALL | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 24b421b4567..5ff3362ef96 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2010-12-31 Eli Zaretskii <eliz@gnu.org> + + * INSTALL: Update the information about PNG support libraries. + (Bug#7716) + 2010-08-02 Óscar Fuentes <ofv@wanadoo.es> * cmdproxy.c (main): Use _snprintf instead of wsprintf, diff --git a/nt/INSTALL b/nt/INSTALL index 83986c4e7c2..fafa9a97b6a 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -279,6 +279,23 @@ If GTK 2.0 is installed, addpm will arrange for its image libraries to be on the DLL search path for Emacs. + For PNG images, we recommend to use versions 1.4.x and later of + libpng, because previous versions had security issues. You can find + precompiled libraries and headers on the GTK download page for + Windows (http://www.gtk.org/download-windows.html). + + Versions 1.4.0 and later of libpng are binary incompatible with + earlier versions, so Emacs will only look for libpng libraries which + are compatible with the version it was compiled against. That + version is given by the value of the Lisp variable `libpng-version'; + e.g., 10403 means version 1.4.3. The variable `image-library-alist' + is automatically set to name only those DLL names that are known to + be compatible with the version given by `libpng-version'. If PNG + support does not work for you even though you have the support DLL + installed, check the name of the installed DLL against + `image-library-alist' and the value of `libpng-version', and + download compatible DLLs if needed. + * Experimental SVG support SVG support is currently experimental, and not built by default. |