Commit 45aebb64 authored by Paul Eggert's avatar Paul Eggert

* image.c (xbm_image_p): Don't assume stated width and height fit in int.

parent f2ed8a70
2011-06-18 Paul Eggert <eggert@cs.ucla.edu>
* image.c (xbm_image_p): Don't assume stated width and height fit in int.
* lisp.h (lint_assume): New macro.
* composite.c (composition_gstring_put_cache):
* ftfont.c (ftfont_shape_by_flt): Use it to pacify GCC 4.6.0.
......
......@@ -2308,7 +2308,7 @@ xbm_image_p (Lisp_Object object)
else
{
Lisp_Object data;
int width, height;
EMACS_INT width, height;
/* Entries for `:width', `:height' and `:data' must be present. */
if (!kw[XBM_WIDTH].count
......@@ -2324,7 +2324,7 @@ xbm_image_p (Lisp_Object object)
data. */
if (VECTORP (data))
{
int i;
EMACS_INT i;
/* Number of elements of the vector must be >= height. */
if (ASIZE (data) < height)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment