From: Claudio Bley <claudio.bley@googlemail.com>
To: Emacs-devel <emacs-devel@gnu.org>
Subject: [PATCH v2 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime
Date: Wed, 30 Oct 2013 13:43:08 +0100 [thread overview]
Message-ID: <877gcvylnn.wl%claudio.bley@gmail.com> (raw)
In-Reply-To: <cover.1383136381.git.claudio.bley@gmail.com>
All jpeglib versions from 7 to 9 are binary incompatible with earlier
ones.
---
lisp/term/w32-win.el | 4 +++-
src/image.c | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 9690a5a..b1e7d9b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -221,8 +221,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
'(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
;; these are libpng 1.2.8 from GTK+
"libpng13d.dll" "libpng13.dll"))
- '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
'(tiff "libtiff3.dll" "libtiff.dll")
+ (if (> jpeglib-version 0)
+ (list 'jpeg (format "libjpeg-%d.dll" (/ jpeglib-version 10)))
+ '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll"))
;; Versions of giflib 5.0.0 and later changed signatures of
;; several functions used by Emacs, which makes those versions
;; incompatible with previous ones. We select the correct
diff --git a/src/image.c b/src/image.c
index 6691cfc..dea3d35 100644
--- a/src/image.c
+++ b/src/image.c
@@ -92,6 +92,12 @@ typedef struct w32_bitmap_record Bitmap_Record;
to correctly set up the alist used to search for the respective
image libraries. */
Lisp_Object Qlibpng_version, Qlibgif_version;
+
+/* Version of jpeglib that we were compiled with, or -1 if no JPEG
+ support was compiled in. This is tested by w32-win.el to correctly
+ set up the alist used to search for JPEG libraries. */
+Lisp_Object Qjpeglib_version;
+
#endif /* HAVE_NTGUI */
#ifdef HAVE_NS
@@ -9411,6 +9417,14 @@ non-numeric, there is no explicit limit on the size of images. */);
#else
make_number (-1)
#endif
+ );
+ DEFSYM (Qjpeglib_version, "jpeglib-version");
+ Fset (Qjpeglib_version,
+#if HAVE_JPEG
+ make_number (JPEG_LIB_VERSION)
+#else
+ make_number (-1)
+#endif
);
#endif
--
1.8.4.msysgit.0
next parent reply other threads:[~2013-10-30 12:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1383136381.git.claudio.bley@gmail.com>
2013-10-30 12:43 ` Claudio Bley [this message]
2013-11-01 9:16 ` [PATCH v2 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 2/5] w32: add support for recent PNG library version >= 1.5 Claudio Bley
2013-11-01 9:16 ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 3/5] w32: add support for default library names for libtiff Claudio Bley
2013-11-01 9:19 ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 4/5] Fix parsing of NetPBM file comments Claudio Bley
2013-11-01 9:19 ` Eli Zaretskii
2013-10-30 12:44 ` [PATCH v2 5/5] Fix file magic for pbm files with comments Claudio Bley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877gcvylnn.wl%claudio.bley@gmail.com \
--to=claudio.bley@googlemail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.