bug#36337: 26.1; XBM images are sometimes not displayed correctly

[Pip Cet <pipcet@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

On Sat, Jun 29, 2019 at 7:56 AM Eli Zaretskii <eliz@gnu.org> wrote:
> Fine with me, but please indent with indent-tabs-mode set to non-nil,
> to be consistent with the surrounding indentation.

Oops. I actually have indent-tabs-mode set to t, so I hope whatever
caused that didn't go wrong in other places.

> Also, this change needs to be called out in NEWS.

How's this?

[-- Attachment #2: 0001-Allow-a-stride-argument-so-XBM-boolvecs-are-in-the-r.patch --]
[-- Type: text/x-patch, Size: 4396 bytes --]

From 5b761e53d7de798fd5d93bb620be682a009bcf66 Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@gmail.com>
Date: Sat, 29 Jun 2019 07:15:52 +0000
Subject: [PATCH] Allow a :stride argument so XBM boolvecs are in the right
 format.

Bug#36337

* src/image.c (xbm_image_p): Explicitly specify the right stride if a
  bool vector is used as argument.
* doc/lispref/display.texi (XBM Images): Describe bool vectors
  accurately.
* etc/NEWS: Document the change.
---
 doc/lispref/display.texi | 18 ++++++++++++------
 etc/NEWS                 |  6 ++++++
 src/image.c              | 14 ++++++++++++--
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 217df3b2cc..8e7d621b41 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5409,12 +5409,14 @@ XBM Images
 XBM file.  The file contents specify the height and width of the image.
 
 @item
-A string or a bool-vector containing the bits of the image (plus perhaps
-some extra bits at the end that will not be used).  It should contain at
-least @var{width} * @code{height} bits.  In this case, you must specify
-@code{:height} and @code{:width}, both to indicate that the string
-contains just the bits rather than a whole XBM file, and to specify the
-size of the image.
+A string or a bool-vector containing the bits of the image (plus
+perhaps some extra bits at the end that will not be used).  It should
+contain at least @var{stride} * @code{height} bits, where @var{stride}
+is the smallest multiple of 8 greater than or equal to the width of
+the image.  In this case, you should specify @code{:height},
+@code{:width} and @code{:stride}, both to indicate that the string
+contains just the bits rather than a whole XBM file, and to specify
+the size of the image.
 @end itemize
 
 @item :width @var{width}
@@ -5422,6 +5424,10 @@ XBM Images
 
 @item :height @var{height}
 The value, @var{height}, specifies the height of the image, in pixels.
+
+@item :stride @var{stride}
+The number of bool vector entries stored for each row; the smallest
+multiple of 8 greater than or equal to @var{width}.
 @end table
 
 @node XPM Images
diff --git a/etc/NEWS b/etc/NEWS
index 864eb8c110..b7165cd1dd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2262,6 +2262,12 @@ argument is 'iec' and the empty string otherwise.  We recomment a
 space or non-breaking space as third argument, and "B" as fourth
 argument, circumstances allowing.
 
++++
+** The XBM image handler now accepts a ':stride' argument.
+This helps with bitmaps generated from Lisp.  Also, the XBM image
+handler no longer reads past the end of a bool vector that is a few
+bytes too short.
+
 \f
 * Changes in Emacs 27.1 on Non-Free Operating Systems
 
diff --git a/src/image.c b/src/image.c
index f3d6508f46..2c29c7b5f2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3095,6 +3095,7 @@ slurp_file (int fd, ptrdiff_t *size)
   XBM_FILE,
   XBM_WIDTH,
   XBM_HEIGHT,
+  XBM_STRIDE,
   XBM_DATA,
   XBM_FOREGROUND,
   XBM_BACKGROUND,
@@ -3116,6 +3117,7 @@ slurp_file (int fd, ptrdiff_t *size)
   {":file",		IMAGE_STRING_VALUE,			0},
   {":width",		IMAGE_POSITIVE_INTEGER_VALUE,		0},
   {":height",		IMAGE_POSITIVE_INTEGER_VALUE,		0},
+  {":stride",		IMAGE_POSITIVE_INTEGER_VALUE,		0},
   {":data",		IMAGE_DONT_CHECK_VALUE_TYPE,		0},
   {":foreground",	IMAGE_STRING_OR_NIL_VALUE,		0},
   {":background",	IMAGE_STRING_OR_NIL_VALUE,		0},
@@ -3191,7 +3193,7 @@ xbm_image_p (Lisp_Object object)
   else
     {
       Lisp_Object data;
-      int width, height;
+      int width, height, stride;
 
       /* Entries for `:width', `:height' and `:data' must be present.  */
       if (!kw[XBM_WIDTH].count
@@ -3203,6 +3205,14 @@ xbm_image_p (Lisp_Object object)
       width = XFIXNAT (kw[XBM_WIDTH].value);
       height = XFIXNAT (kw[XBM_HEIGHT].value);
 
+      if (!kw[XBM_STRIDE].count)
+	stride = width;
+      else
+	stride = XFIXNAT (kw[XBM_STRIDE].value);
+
+      if (height > 1 && stride != (width + CHAR_BIT - 1) / CHAR_BIT * CHAR_BIT)
+	return 0;
+
       /* Check type of data, and width and height against contents of
 	 data.  */
       if (VECTORP (data))
@@ -3242,7 +3252,7 @@ xbm_image_p (Lisp_Object object)
 	}
       else if (BOOL_VECTOR_P (data))
 	{
-	  if (bool_vector_size (data) / height < width)
+	  if (bool_vector_size (data) / height < stride)
 	    return 0;
 	}
       else
-- 
2.20.1