diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-03-06 17:18:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-03-06 17:18:51 +0000 |
| commit | 1f7e64a9d185ccbc8af1ef57998da04049948e3b (patch) | |
| tree | 69f44f08cb6eb946fb1c8f4ea162226ebfadac12 | |
| parent | 60b6183908ac8ff7505d213ad5a645fe5056541b (diff) | |
| download | gdk-pixbuf-1f7e64a9d185ccbc8af1ef57998da04049948e3b.tar.gz | |
Check that the pixmap has the right depth. (#333363, Ed Catmur)
2006-03-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
has the right depth. (#333363, Ed Catmur)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkpixmap.c | 1 |
3 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2006-03-06 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap + has the right depth. (#333363, Ed Catmur) + 2006-03-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkiconview.c (adjust_wrap_width): Apply some diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index af0eebe18..8817cbab7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-03-06 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap + has the right depth. (#333363, Ed Catmur) + 2006-03-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkiconview.c (adjust_wrap_width): Apply some diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 4768f77f7..0dade0432 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -131,6 +131,7 @@ gtk_pixmap_set (GtkPixmap *pixmap, gint oldheight; g_return_if_fail (GTK_IS_PIXMAP (pixmap)); + g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val))); if (pixmap->pixmap != val) { |