aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-12 23:50:17 -0800
committerPaul Eggert2011-03-12 23:50:17 -0800
commitf0c77cd1b28a5ee9de06eef06c768fe34d7f0140 (patch)
tree87b4722e78fb55e74a72de68cb9b0c7a72b10f5a
parent6ae141d682670b1d21abd86fd530cca016f73985 (diff)
downloademacs-f0c77cd1b28a5ee9de06eef06c768fe34d7f0140.tar.gz
emacs-f0c77cd1b28a5ee9de06eef06c768fe34d7f0140.zip
* image.c (four_corners_best): Mark locals as initialized.
(gif_load): Initialize transparent_p to zero (Bug#8238). Mark another local as initialized.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/image.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c99d3626e05..2a2ef75a316 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-03-13 Paul Eggert <eggert@cs.ucla.edu>
2
3 * image.c (four_corners_best): Mark locals as initialized.
4 (gif_load): Initialize transparent_p to zero (Bug#8238).
5 Mark another local as initialized.
6
12011-03-11 Paul Eggert <eggert@cs.ucla.edu> 72011-03-11 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 * image.c (clear_image_cache): Now static. 9 * image.c (clear_image_cache): Now static.
diff --git a/src/image.c b/src/image.c
index 1f2a4609536..a4be1d1b898 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1137,7 +1137,7 @@ static RGB_PIXEL_COLOR
1137four_corners_best (XImagePtr_or_DC ximg, int *corners, 1137four_corners_best (XImagePtr_or_DC ximg, int *corners,
1138 unsigned long width, unsigned long height) 1138 unsigned long width, unsigned long height)
1139{ 1139{
1140 RGB_PIXEL_COLOR corner_pixels[4], best; 1140 RGB_PIXEL_COLOR corner_pixels[4], best IF_LINT (= 0);
1141 int i, best_count; 1141 int i, best_count;
1142 1142
1143 if (corners && corners[BOT_CORNER] >= 0) 1143 if (corners && corners[BOT_CORNER] >= 0)
@@ -7103,7 +7103,7 @@ gif_load (struct frame *f, struct image *img)
7103 Lisp_Object file, specified_file; 7103 Lisp_Object file, specified_file;
7104 Lisp_Object specified_data; 7104 Lisp_Object specified_data;
7105 int rc, width, height, x, y, i; 7105 int rc, width, height, x, y, i;
7106 boolean transparent_p; 7106 boolean transparent_p = 0;
7107 XImagePtr ximg; 7107 XImagePtr ximg;
7108 ColorMapObject *gif_color_map; 7108 ColorMapObject *gif_color_map;
7109 unsigned long pixel_colors[256]; 7109 unsigned long pixel_colors[256];
@@ -7112,7 +7112,7 @@ gif_load (struct frame *f, struct image *img)
7112 int ino, image_height, image_width; 7112 int ino, image_height, image_width;
7113 gif_memory_source memsrc; 7113 gif_memory_source memsrc;
7114 unsigned char *raster; 7114 unsigned char *raster;
7115 unsigned int transparency_color_index; 7115 unsigned int transparency_color_index IF_LINT (= 0);
7116 7116
7117 specified_file = image_spec_value (img->spec, QCfile, NULL); 7117 specified_file = image_spec_value (img->spec, QCfile, NULL);
7118 specified_data = image_spec_value (img->spec, QCdata, NULL); 7118 specified_data = image_spec_value (img->spec, QCdata, NULL);