aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-07-25 17:11:42 +0000
committerChong Yidong2008-07-25 17:11:42 +0000
commit9d7112edd6319079997522d9fd835fdd9fc2cccf (patch)
tree58ecbb18ca5d8e0ce2e1ca9f557e06527309ebdd /src
parente025c9c2fd7016ab3c1e3e968e975780fceb616b (diff)
downloademacs-9d7112edd6319079997522d9fd835fdd9fc2cccf.tar.gz
emacs-9d7112edd6319079997522d9fd835fdd9fc2cccf.zip
(x_from_xcolors): Don't initialize pixmap (silence compiler).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/image.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2d7ef660253..d310b71cd72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
4 (svg_load_image): Use rsvg_handle_get_dimensions to check that 4 (svg_load_image): Use rsvg_handle_get_dimensions to check that
5 image size is valid. Use g_object_unref instead of deprecated 5 image size is valid. Use g_object_unref instead of deprecated
6 rsvg_handle_free to free rsvg handle. 6 rsvg_handle_free to free rsvg handle.
7 (x_from_xcolors): Don't initialize pixmap (silence compiler).
7 8
82008-07-25 Jason Rumney <jasonr@gnu.org> 92008-07-25 Jason Rumney <jasonr@gnu.org>
9 10
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)
5597{ 5597{
5598 int x, y; 5598 int x, y;
5599 XImagePtr oimg = NULL; 5599 XImagePtr oimg = NULL;
5600 Pixmap pixmap = NULL; 5600 Pixmap pixmap;
5601 XColor *p; 5601 XColor *p;
5602 5602
5603 init_color_table (); 5603 init_color_table ();