[PATCH 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime

[PATCH 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime

[Claudio Bley]

---
 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 2b07b83..2245615 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

-- 
Claudio-- 
Claudio-- 
Claudio

Re: [PATCH 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime

[Eli Zaretskii]

To answer my own question: indeed, it seems like jpeg-7, jpeg-8, and
jpeg-9 (the latest) each one breaks binary compatibility with previous
versions.  Which is unfortunate, but I guess we have no choice but to
adapt.

So this patch looks OK to me, thanks.

[PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Claudio Bley]

---
 lisp/term/w32-win.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b1e7d9b..9db771b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -215,12 +215,16 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
        ;; earlier versions.  Set up the list of libraries according to
        ;; the version we were compiled against.  (If we were compiled
        ;; without PNG support, libpng-version's value is -1.)
-       (if (>= libpng-version 10400)
-	   ;; libpng14-14.dll is libpng 1.4.3 from GTK+
-	   '(png "libpng14-14.dll" "libpng14.dll")
-	 '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
-	       ;; these are libpng 1.2.8 from GTK+
-	       "libpng13d.dll" "libpng13.dll"))
+       (if (>= libpng-version 10500)
+	   (let ((major (/ libpng-version 10000))
+		 (minor (mod (/ libpng-version 100) 10)))
+	     (list 'png (format "libpng%d%d.dll" major minor)))
+	 (if (>= libpng-version 10400)
+	     ;; libpng14-14.dll is libpng 1.4.3 from GTK+
+	     '(png "libpng14-14.dll" "libpng14.dll")
+	   '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
+		 ;; these are libpng 1.2.8 from GTK+
+		 "libpng13d.dll" "libpng13.dll")))
        '(tiff "libtiff3.dll" "libtiff.dll")
        (if (> jpeglib-version 0)
 	   (list 'jpeg (format "libjpeg-%d.dll" (/ jpeglib-version 10)))
-- 
1.8.4.msysgit.0

-- 
Claudio-- 
Claudio

Re: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Eli Zaretskii]

Here, too, latest libpng versions are incompatible with 1.4.x, so we
do need to make such a change.

However, when one builds libpng-X.Y.Z on Windows, the DLL that is
installed is called libpngXY-XY.dll, not just libpngXY.dll, as your
patch assumes.  I don't mind supporting both forms, but we must
support the form used by "make install" in the libpng distribution.

So could you please modify this patch accordingly?

Thanks.

Re: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Claudio Bley]

At Sun, 27 Oct 2013 18:28:26 +0200,
Eli Zaretskii wrote:
> 
> Here, too, latest libpng versions are incompatible with 1.4.x, so we
> do need to make such a change.
> 
> However, when one builds libpng-X.Y.Z on Windows, the DLL that is
> installed is called libpngXY-XY.dll, not just libpngXY.dll, as your
> patch assumes.

I'm building with CMake and that's what the CMake builds produce.

If you download the release tarball (lpng166.7z) for win32, the DLL
produced is also called libpng16.dll.

> I don't mind supporting both forms, but we must support the form
> used by "make install" in the libpng distribution.
> 
> So could you please modify this patch accordingly?

OK, I'll add libpngXY-XY.dll as a second alternative, since
libpngXY.dll seems to be the platform default.

Re: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Eli Zaretskii]

> Date: Tue, 29 Oct 2013 09:44:01 +0100
> From: Claudio Bley <claudio.bley@googlemail.com>
> Cc: emacs-devel@gnu.org
> 
> At Sun, 27 Oct 2013 18:28:26 +0200,
> Eli Zaretskii wrote:
> > 
> > Here, too, latest libpng versions are incompatible with 1.4.x, so we
> > do need to make such a change.
> > 
> > However, when one builds libpng-X.Y.Z on Windows, the DLL that is
> > installed is called libpngXY-XY.dll, not just libpngXY.dll, as your
> > patch assumes.
> 
> I'm building with CMake and that's what the CMake builds produce.

Worth writing to the maintainers about, IMO, since CMake is not the
standard build method (AFAIK).

> If you download the release tarball (lpng166.7z) for win32, the DLL
> produced is also called libpng16.dll.

If you build with CMake or if you build with the usual "configure && make"?

> > I don't mind supporting both forms, but we must support the form
> > used by "make install" in the libpng distribution.
> > 
> > So could you please modify this patch accordingly?
> 
> OK, I'll add libpngXY-XY.dll as a second alternative, since
> libpngXY.dll seems to be the platform default.

Thanks.

Re: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Claudio Bley]

At Tue, 29 Oct 2013 18:50:52 +0200,
Eli Zaretskii wrote:
> 
> > Date: Tue, 29 Oct 2013 09:44:01 +0100
> > From: Claudio Bley <claudio.bley@googlemail.com>
> > Cc: emacs-devel@gnu.org
> > 
> > At Sun, 27 Oct 2013 18:28:26 +0200,
> > Eli Zaretskii wrote:
> > > 
> > > Here, too, latest libpng versions are incompatible with 1.4.x, so we
> > > do need to make such a change.
> > > 
> > > However, when one builds libpng-X.Y.Z on Windows, the DLL that is
> > > installed is called libpngXY-XY.dll, not just libpngXY.dll, as your
> > > patch assumes.
> > 
> > I'm building with CMake and that's what the CMake builds produce.
> 
> Worth writing to the maintainers about, IMO, since CMake is not the
> standard build method (AFAIK).

On w32 it is probably more standard than building with autotools, IMO.

It also begs the question what the most reasonable name would be,
ie. what's the point of duplicating the version after a dash? Seems
it's only because of libtool, which is probably not really relevant on
w32 anyway.

> > If you download the release tarball (lpng166.7z) for win32, the DLL
> > produced is also called libpng16.dll.
> 
> If you build with CMake or if you build with the usual "configure && make"?

Neither, they support building with different compilers by copying a
Makefile from the "scripts" subdir to the project root dir. The w32
"tarballs" don't even have a configure script.

Re: [PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Eli Zaretskii]

> Date: Wed, 30 Oct 2013 13:50:57 +0100
> From: Claudio Bley <claudio.bley@googlemail.com>
> Cc: emacs-devel@gnu.org
> 
> > > I'm building with CMake and that's what the CMake builds produce.
> > 
> > Worth writing to the maintainers about, IMO, since CMake is not the
> > standard build method (AFAIK).
> 
> On w32 it is probably more standard than building with autotools, IMO.

I doubt that.  But I won't argue.

> It also begs the question what the most reasonable name would be,
> ie. what's the point of duplicating the version after a dash?

That's why I suggested to write to the maintainers.

> Seems it's only because of libtool, which is probably not really
> relevant on w32 anyway.

libtool _is_ relevant to w32 because many packages use it to link
against external libraries.

> > > If you download the release tarball (lpng166.7z) for win32, the DLL
> > > produced is also called libpng16.dll.
> > 
> > If you build with CMake or if you build with the usual "configure && make"?
> 
> Neither, they support building with different compilers by copying a
> Makefile from the "scripts" subdir to the project root dir. The w32
> "tarballs" don't even have a configure script.

Strange distribution policy, IMO.

[PATCH 3/5] w32: add support for default library names for libtiff

[Claudio Bley]

---
 lisp/term/w32-win.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 9db771b..9ec852d 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -225,7 +225,7 @@ 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")))
-       '(tiff "libtiff3.dll" "libtiff.dll")
+       '(tiff "libtiff-5.dll" "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"))
-- 
1.8.4.msysgit.0

-- 
Claudio-- 
Claudio

Re: [PATCH 3/5] w32: add support for default library names for libtiff

[Eli Zaretskii]

> From: claudio.bley@gmail.com (Claudio Bley)
> Date: Fri, 25 Oct 2013 17:36:50 +0200
> 
> ---
>  lisp/term/w32-win.el | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
> index 9db771b..9ec852d 100644
> --- a/lisp/term/w32-win.el
> +++ b/lisp/term/w32-win.el
> @@ -225,7 +225,7 @@ 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")))
> -       '(tiff "libtiff3.dll" "libtiff.dll")
> +       '(tiff "libtiff-5.dll" "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"))

This is OK, thanks.

[PATCH 4/5] Fix parsing of NetPBM file comments

[Claudio Bley]

Comments in NetPBM headers can occur in the middle of a token.

(see http://netpbm.sourceforge.net/doc/pbm.html)
---
 src/image.c | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/image.c b/src/image.c
index 2245615..798fc43 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5111,6 +5111,27 @@ pbm_image_p (Lisp_Object object)
 }
 
 
+/* Get next char skipping comments in Netpbm header.  Returns -1 at
+   end of input.  */
+
+static int
+pbm_next_char (unsigned char **s, unsigned char *end)
+{
+  int c = -1;
+
+  while (*s < end && (c = *(*s)++, c == '#'))
+    {
+      /* Skip to the next line break */
+      while (*s < end && (c = *(*s)++, c != '\n' && c != '\r'))
+        ;
+
+      c = -1;
+    }
+
+  return c;
+}
+
+
 /* Scan a decimal number from *S and return it.  Advance *S while
    reading the number.  END is the end of the string.  Value is -1 at
    end of input.  */
@@ -5120,28 +5141,16 @@ pbm_scan_number (unsigned char **s, unsigned char *end)
 {
   int c = 0, val = -1;
 
-  while (*s < end)
-    {
-      /* Skip white-space.  */
-      while (*s < end && (c = *(*s)++, c_isspace (c)))
-	;
+  /* Skip white-space.  */
+  while ((c = pbm_next_char (s, end)) != -1 && c_isspace (c))
+    ;
 
-      if (c == '#')
-	{
-	  /* Skip comment to end of line.  */
-	  while (*s < end && (c = *(*s)++, c != '\n'))
-	    ;
-	}
-      else if (c_isdigit (c))
-	{
-	  /* Read decimal number.  */
-	  val = c - '0';
-	  while (*s < end && (c = *(*s)++, c_isdigit (c)))
-	    val = 10 * val + c - '0';
-	  break;
-	}
-      else
-	break;
+  if (c_isdigit (c))
+    {
+      /* Read decimal number.  */
+      val = c - '0';
+      while ((c = pbm_next_char (s, end)) != -1 && c_isdigit (c))
+        val = 10 * val + c - '0';
     }
 
   return val;
-- 
1.8.4.msysgit.0

-- 
Claudio-- 
Claudio

[PATCH 2/5] w32: add support for recent PNG library version >= 1.5

[Claudio Bley]

---
 lisp/term/w32-win.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b1e7d9b..9db771b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -215,12 +215,16 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
        ;; earlier versions.  Set up the list of libraries according to
        ;; the version we were compiled against.  (If we were compiled
        ;; without PNG support, libpng-version's value is -1.)
-       (if (>= libpng-version 10400)
-	   ;; libpng14-14.dll is libpng 1.4.3 from GTK+
-	   '(png "libpng14-14.dll" "libpng14.dll")
-	 '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
-	       ;; these are libpng 1.2.8 from GTK+
-	       "libpng13d.dll" "libpng13.dll"))
+       (if (>= libpng-version 10500)
+	   (let ((major (/ libpng-version 10000))
+		 (minor (mod (/ libpng-version 100) 10)))
+	     (list 'png (format "libpng%d%d.dll" major minor)))
+	 (if (>= libpng-version 10400)
+	     ;; libpng14-14.dll is libpng 1.4.3 from GTK+
+	     '(png "libpng14-14.dll" "libpng14.dll")
+	   '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll"
+		 ;; these are libpng 1.2.8 from GTK+
+		 "libpng13d.dll" "libpng13.dll")))
        '(tiff "libtiff3.dll" "libtiff.dll")
        (if (> jpeglib-version 0)
 	   (list 'jpeg (format "libjpeg-%d.dll" (/ jpeglib-version 10)))
-- 
1.8.4.msysgit.0

-- 
Claudio
-- 
Claudio

[PATCH 5/5] Fix file magic for pbm files with comments

[Claudio Bley]

Comments in NetPBM files are allowed to occur in the middle of a
token.
---
 lisp/image.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/image.el b/lisp/image.el
index 91cc3ad..e56328b 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,7 +34,10 @@
 
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
-    ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
+    ("\\`P[1-6]\\\(?:\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\
+\\)\\{2\\}" . pbm)
     ("\\`GIF8[79]a" . gif)
     ("\\`\x89PNG\r\n\x1a\n" . png)
     ("\\`[\t\n\r ]*#define \\([a-z0-9_]+\\)_width [0-9]+\n\
-- 
1.8.4.msysgit.0