From b018182ccdc0e8ecc1156ed4fa06a7464b0de572 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 15 Nov 2011 20:08:38 +0200 Subject: [PATCH] Update information about PNG libraries for MS-Windows. admin/nt/README-ftp-server: Update the information about PNG libraries. nt/README.W32: Update the GTK Windows download URL for libpng. --- admin/ChangeLog | 5 +++++ admin/nt/README-ftp-server | 21 +++++++++++++-------- nt/ChangeLog | 4 ++++ nt/README.W32 | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 40a6df09c31..f6adb084e88 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-11-15 Eli Zaretskii + + * nt/README-ftp-server: Update the information about PNG + libraries. + 2011-11-15 Juanma Barranquero * make-emacs: Fix typo. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 3c70ed8dbe0..82e33cc5418 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -73,10 +73,11 @@ See the end of the file for license conditions. * Image support - Emacs 24.1 contains support for images, however for most image formats - supporting libraries are required. This distribution has been tested - with the libraries that are distributed with GTK for Windows, and the - libraries found at http://gnuwin32.sourceforge.net/. The following image + Emacs 24.1 contains support for images, however for most image + formats supporting libraries are required. This distribution has + been tested with the libraries that are distributed with GTK for + Windows (http://www.gtk.org/download/win32.php), and the libraries + found at http://gnuwin32.sourceforge.net/. The following image formats are supported: PBM/PGM/PPM: Supported natively by Emacs. This format is used for @@ -87,10 +88,14 @@ See the end of the file for license conditions. can be replaced by other versions with the name xpm4.dll, libxpm-nox4.dll or libxpm.dll. - PNG: requires the PNG reference library 1.2 or later, which will - be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll - or libpng.dll. LibPNG requires zlib, which should come from the same - source as you got libpng. + PNG: requires the PNG reference library 1.4 or later, which will + be named libpng14.dll or libpng14-14.dll. LibPNG requires zlib, + which should come from the same source as you got libpng. + Starting with Emacs 23.3, the precompiled Emacs binaries are + built with libpng 1.4.x and later, and are incompatible with + earlier versions of libpng DLLs. So if you have libpng 1.2.x, + the PNG support will not work, and you will have to download + newer versions. JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. diff --git a/nt/ChangeLog b/nt/ChangeLog index 512e08678ff..7fca6271052 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2011-11-15 Eli Zaretskii + + * README.W32: Update the GTK Windows download URL for libpng. + 2011-11-13 Christoph Scholtes * inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values. diff --git a/nt/README.W32 b/nt/README.W32 index 259a0ea6e41..52582dc7ccf 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -129,7 +129,7 @@ See the end of the file for license conditions. Emacs can also support some other image formats with appropriate libraries. These libraries are all available as part of GTK - download for Windows (http://www.gtk.org/download-windows.html), or + download for Windows (http://www.gtk.org/download/win32.php), or from the GnuWin32 project. Emacs will find them if the directory they are installed in is on the PATH. -- 2.39.2