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 @@
+2011-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (four_corners_best): Mark locals as initialized.
+        (gif_load): Initialize transparent_p to zero (Bug#8238).
+        Mark another local as initialized.
+
 2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         * 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
 four_corners_best (XImagePtr_or_DC ximg, int *corners,
                    unsigned long width, unsigned long height)
 {
-  RGB_PIXEL_COLOR corner_pixels[4], best;
+  RGB_PIXEL_COLOR corner_pixels[4], best IF_LINT (= 0);
   int i, best_count;
 
   if (corners && corners[BOT_CORNER] >= 0)
@@ -7103,7 +7103,7 @@ gif_load (struct frame *f, struct image *img)
   Lisp_Object file, specified_file;
   Lisp_Object specified_data;
   int rc, width, height, x, y, i;
-  boolean transparent_p;
+  boolean transparent_p = 0;
   XImagePtr ximg;
   ColorMapObject *gif_color_map;
   unsigned long pixel_colors[256];
@@ -7112,7 +7112,7 @@ gif_load (struct frame *f, struct image *img)
   int ino, image_height, image_width;
   gif_memory_source memsrc;
   unsigned char *raster;
-  unsigned int transparency_color_index;
+  unsigned int transparency_color_index IF_LINT (= 0);
 
   specified_file = image_spec_value (img->spec, QCfile, NULL);
   specified_data = image_spec_value (img->spec, QCdata, NULL);