[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106387: Update information about PNG
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106387: Update information about PNG libraries for MS-Windows. |
Date: |
Tue, 15 Nov 2011 20:08:38 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106387
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-15 20:08:38 +0200
message:
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.
modified:
admin/ChangeLog
admin/nt/README-ftp-server
nt/ChangeLog
nt/README.W32
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2011-11-15 17:37:37 +0000
+++ b/admin/ChangeLog 2011-11-15 18:08:38 +0000
@@ -1,3 +1,8 @@
+2011-11-15 Eli Zaretskii <address@hidden>
+
+ * nt/README-ftp-server: Update the information about PNG
+ libraries.
+
2011-11-15 Juanma Barranquero <address@hidden>
* make-emacs: Fix typo.
=== modified file 'admin/nt/README-ftp-server'
--- a/admin/nt/README-ftp-server 2011-11-11 23:17:16 +0000
+++ b/admin/nt/README-ftp-server 2011-11-15 18:08:38 +0000
@@ -73,10 +73,11 @@
* 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 @@
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.
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2011-11-13 14:43:13 +0000
+++ b/nt/ChangeLog 2011-11-15 18:08:38 +0000
@@ -1,3 +1,7 @@
+2011-11-15 Eli Zaretskii <address@hidden>
+
+ * README.W32: Update the GTK Windows download URL for libpng.
+
2011-11-13 Christoph Scholtes <address@hidden>
* inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values.
=== modified file 'nt/README.W32'
--- a/nt/README.W32 2011-11-11 23:17:16 +0000
+++ b/nt/README.W32 2011-11-15 18:08:38 +0000
@@ -129,7 +129,7 @@
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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106387: Update information about PNG libraries for MS-Windows.,
Eli Zaretskii <=