mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 01:20:37 -08:00
Code Issues Projects Releases Wiki Activity

(png_load): Make sure SPECIFIED_BG is a string.

Browse source 
(png_load): BG is a pointer to a structure, not a structure.
(gif_format, png_format): Add missing commas.
This commit is contained in:
Miles Bader 2001-10-25 00:53:48 +00:00
parent f6608d5cc8
commit f2f0a64423
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/xfns.c
View file

@ -8615,7 +8615,7 @@ static struct image_keyword png_format[PNG_LAST] =
{":relief", IMAGE_INTEGER_VALUE, 0},
{":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}
{":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":background", IMAGE_STRING_OR_NIL_VALUE, 0}
};
@ -8891,11 +8891,11 @@ png_load (f, img)
Lisp_Object specified_bg
= image_spec_value (img->spec, QCbackground, NULL);
if (! NILP (specified_bg))
if (STRINGP (specified_bg))
/* The user specified `:background', use that. */
{
XColor color;
if (x_defined_color (f, specified_bg, &color, 0))
if (x_defined_color (f, XSTRING (specified_bg)->data, &color, 0))
{
png_color_16 user_bg;
@ -9031,7 +9031,7 @@ png_load (f, img)
png_color_16 *bg;
if (png_get_bKGD (png_ptr, info_ptr, &bg))
{
img->background = lookup_rgb_color (f, bg.red, bg.green, bg.blue);
img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue);
img->background_valid = 1;
}
}
@ -9854,7 +9854,7 @@ static struct image_keyword gif_format[GIF_LAST] =
{":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
{":image", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0}
{":image", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0},
{":background", IMAGE_STRING_OR_NIL_VALUE, 0}
};