aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThien-Thi Nguyen2007-09-06 20:28:40 +0000
committerThien-Thi Nguyen2007-09-06 20:28:40 +0000
commit315912fb92b1123bd67a28c7fd0b8c3a4f261f25 (patch)
treef357d665f6a61b1d2ef0383ef100bc8bdd88e564 /src
parentf63f5da887b9bad0a0c99687075331833829a53d (diff)
downloademacs-315912fb92b1123bd67a28c7fd0b8c3a4f261f25.tar.gz
emacs-315912fb92b1123bd67a28c7fd0b8c3a4f261f25.zip
(gif_load): Fix bug: Handle nonexistent colormap.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c15
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ad81e6c63f4..1d13b2955e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-09-06 Pixel <pixel@mandriva.com> (tiny change)
2
3 * image.c (gif_load): Fix bug: Handle nonexistent colormap.
4
12007-09-06 Glenn Morris <rgm@gnu.org> 52007-09-06 Glenn Morris <rgm@gnu.org>
2 6
3 * gtkutil.c (menu_grab_callback) <cnt>: 7 * gtkutil.c (menu_grab_callback) <cnt>:
diff --git a/src/image.c b/src/image.c
index 91cb7eb570e..cd70166c295 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7878,13 +7878,14 @@ gif_load (f, img)
7878 init_color_table (); 7878 init_color_table ();
7879 bzero (pixel_colors, sizeof pixel_colors); 7879 bzero (pixel_colors, sizeof pixel_colors);
7880 7880
7881 for (i = 0; i < gif_color_map->ColorCount; ++i) 7881 if (gif_color_map)
7882 { 7882 for (i = 0; i < gif_color_map->ColorCount; ++i)
7883 int r = gif_color_map->Colors[i].Red << 8; 7883 {
7884 int g = gif_color_map->Colors[i].Green << 8; 7884 int r = gif_color_map->Colors[i].Red << 8;
7885 int b = gif_color_map->Colors[i].Blue << 8; 7885 int g = gif_color_map->Colors[i].Green << 8;
7886 pixel_colors[i] = lookup_rgb_color (f, r, g, b); 7886 int b = gif_color_map->Colors[i].Blue << 8;
7887 } 7887 pixel_colors[i] = lookup_rgb_color (f, r, g, b);
7888 }
7888 7889
7889#ifdef COLOR_TABLE_SUPPORT 7890#ifdef COLOR_TABLE_SUPPORT
7890 img->colors = colors_in_color_table (&img->ncolors); 7891 img->colors = colors_in_color_table (&img->ncolors);