diff options
| author | Andreas Schwab | 2011-09-10 20:13:24 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2011-09-10 20:13:24 +0200 |
| commit | 8d903f4e5d492df1c153ba3d53c19fac9e9ec3f2 (patch) | |
| tree | 87f3c76d51a77950908939bf8d3a109ac40cd72e /src | |
| parent | 80ad64f4f513abc0d35bdf18f3a9a68df770ad1a (diff) | |
| download | emacs-8d903f4e5d492df1c153ba3d53c19fac9e9ec3f2.tar.gz emacs-8d903f4e5d492df1c153ba3d53c19fac9e9ec3f2.zip | |
* src/image.c (gif_load): Fix calculation of bottom and right corner.
(Bug#9468)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78ef2c1c56b..6c54d3351c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-10 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * image.c (gif_load): Fix calculation of bottom and right corner. | ||
| 4 | (Bug#9468) | ||
| 5 | |||
| 1 | 2011-09-10 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-09-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (MAX_DISP_SCAN): Decrease to 250. Prevents sluggish | 8 | * xdisp.c (MAX_DISP_SCAN): Decrease to 250. Prevents sluggish |
diff --git a/src/image.c b/src/image.c index fc79174c1e2..db201d5a831 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7229,8 +7229,10 @@ gif_load (struct frame *f, struct image *img) | |||
| 7229 | 7229 | ||
| 7230 | img->corners[TOP_CORNER] = gif->SavedImages[0].ImageDesc.Top; | 7230 | img->corners[TOP_CORNER] = gif->SavedImages[0].ImageDesc.Top; |
| 7231 | img->corners[LEFT_CORNER] = gif->SavedImages[0].ImageDesc.Left; | 7231 | img->corners[LEFT_CORNER] = gif->SavedImages[0].ImageDesc.Left; |
| 7232 | img->corners[BOT_CORNER] = img->corners[TOP_CORNER] + height; | 7232 | img->corners[BOT_CORNER] |
| 7233 | img->corners[RIGHT_CORNER] = img->corners[LEFT_CORNER] + width; | 7233 | = img->corners[TOP_CORNER] + gif->SavedImages[0].ImageDesc.Height; |
| 7234 | img->corners[RIGHT_CORNER] | ||
| 7235 | = img->corners[LEFT_CORNER] + gif->SavedImages[0].ImageDesc.Width; | ||
| 7234 | 7236 | ||
| 7235 | if (!check_image_size (f, width, height)) | 7237 | if (!check_image_size (f, width, height)) |
| 7236 | { | 7238 | { |