diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-11-15 20:08:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-11-15 20:08:38 +0200 |
| commit | b018182ccdc0e8ecc1156ed4fa06a7464b0de572 (patch) | |
| tree | 43bd6ce011327fac68aa2dc35ad0387d91797c87 /admin/nt | |
| parent | 303ad845154ee26efc6fbceb13f3202e554e7d87 (diff) | |
| download | emacs-b018182ccdc0e8ecc1156ed4fa06a7464b0de572.tar.gz | |
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.
Diffstat (limited to 'admin/nt')
| -rw-r--r-- | admin/nt/README-ftp-server | 21 |
1 files changed, 13 insertions, 8 deletions
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. |