Overflow, signedness and related fixes for images.

[gnu-emacs] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index 5285d945975c03044f4b92217289d0d02ee4af5c..50f6f79c941f8498486b1864cdcf05fe33da0ad6 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21119,7 +21119,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
          if (FRAME_WINDOW_P (it->f)
              && valid_image_p (prop))
            {
-             int id = lookup_image (it->f, prop);
+             ptrdiff_t id = lookup_image (it->f, prop);
              struct image *img = IMAGE_FROM_ID (it->f, id);
 
              return OK_PIXELS (width_p ? img->width : img->height);