aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-06-10 11:46:48 -0400
committerChong Yidong2011-06-10 11:46:48 -0400
commit2547adb13e24bcb6aa855b8e107a16bc0205002e (patch)
tree1bae169e1e6f141470ab8738ca987b4931f36b97 /src
parent2c8e37d4977b0474872c51ea2700bf73c7436d3c (diff)
downloademacs-2547adb13e24bcb6aa855b8e107a16bc0205002e.tar.gz
emacs-2547adb13e24bcb6aa855b8e107a16bc0205002e.zip
* image.c (gif_load): Fix omitted cast error introduced by 2011-06-06 change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/image.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 93aaef013fb..cbb0999d50e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-06-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * image.c (gif_load): Fix omitted cast error introduced by
4 2011-06-06 change.
5
12011-06-10 Martin Rudalics <rudalics@gmx.at> 62011-06-10 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.h (resize_proportionally, orig_total_lines) 8 * window.h (resize_proportionally, orig_total_lines)
diff --git a/src/image.c b/src/image.c
index cdf05c78764..b6f54f01e95 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7238,7 +7238,7 @@ gif_load (struct frame *f, struct image *img)
7238 /* From gif89a spec: 1 = "keep in place", 2 = "restore 7238 /* From gif89a spec: 1 = "keep in place", 2 = "restore
7239 to background". Treat any other value like 2. */ 7239 to background". Treat any other value like 2. */
7240 disposal = (extblock->Bytes[0] >> 2) & 7; 7240 disposal = (extblock->Bytes[0] >> 2) & 7;
7241 transparency_color_index = extblock->Bytes[3]; 7241 transparency_color_index = (unsigned char) extblock->Bytes[3];
7242 break; 7242 break;
7243 } 7243 }
7244 } 7244 }