From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 25 Jul 2008 17:11:42 +0000 (+0000)
Subject: (x_from_xcolors): Don't initialize pixmap (silence compiler).
X-Git-Tag: emacs-pretest-23.0.90~3887
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d7112edd6319079997522d9fd835fdd9fc2cccf;p=emacs.git

(x_from_xcolors): Don't initialize pixmap (silence compiler).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d7ef660253..d310b71cd72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
 	(svg_load_image): Use rsvg_handle_get_dimensions to check that
 	image size is valid.  Use g_object_unref instead of deprecated
 	rsvg_handle_free to free rsvg handle.
+	(x_from_xcolors): Don't initialize pixmap (silence compiler).
 
 2008-07-25  Jason Rumney  <jasonr@gnu.org>
 
diff --git a/src/image.c b/src/image.c
index 5c9f5d5bdd1..65208c4783d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5597,7 +5597,7 @@ x_from_xcolors (f, img, colors)
 {
   int x, y;
   XImagePtr oimg = NULL;
-  Pixmap pixmap = NULL;
+  Pixmap pixmap;
   XColor *p;
 
   init_color_table ();