Mercurial > emacs
changeset 65723:b88d5090aa86
(gif_load): Fix size of allocated image buffer
for images where a sub-image may be larger than the image's
total height/width specifications.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 28 Sep 2005 10:48:20 +0000 |
| parents | 514b3d667f9e |
| children | e0ee2d15f961 |
| files | src/image.c |
| diffstat | 1 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Wed Sep 28 10:47:51 2005 +0000 +++ b/src/image.c Wed Sep 28 10:48:20 2005 +0000 @@ -7369,8 +7369,17 @@ return 0; } - width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width); - height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height); + image_top = gif->SavedImages[ino].ImageDesc.Top; + image_left = gif->SavedImages[ino].ImageDesc.Left; + image_width = gif->SavedImages[ino].ImageDesc.Width; + image_height = gif->SavedImages[ino].ImageDesc.Height; + + width = img->width = max (gif->SWidth, + max (gif->Image.Left + gif->Image.Width, + image_left + image_width)); + height = img->height = max (gif->SHeight, + max (gif->Image.Top + gif->Image.Height, + image_top + image_height)); /* Create the X image and pixmap. */ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) @@ -7405,11 +7414,6 @@ requires more than can be done here (see the gif89 spec, disposal methods). Let's simply assume that the part not covered by a sub-image is in the frame's background color. */ - image_top = gif->SavedImages[ino].ImageDesc.Top; - image_left = gif->SavedImages[ino].ImageDesc.Left; - image_width = gif->SavedImages[ino].ImageDesc.Width; - image_height = gif->SavedImages[ino].ImageDesc.Height; - for (y = 0; y < image_top; ++y) for (x = 0; x < width; ++x) XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));