From c16e87bcba46d6f84c86aaad0510021f02ab0f9b Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Thu, 26 Jul 2001 20:07:08 +0000 Subject: [PATCH] Initialize image->bits_per_pixel from the drawable, not from the root 2001-07-26 Alex Larsson * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Initialize image->bits_per_pixel from the drawable, not from the root window. * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): Fix cast. argument is an IMPL already. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/linux-fb/gdkdrawable-fb2.c | 2 +- gdk/linux-fb/gdkimage-fb.c | 2 +- 9 files changed, 65 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 726bb5e786..272b4ddcb5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-07-26 Alex Larsson + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): + Initialize image->bits_per_pixel from the drawable, not from + the root window. + + * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth): + Fix cast. argument is an IMPL already. + 2001-07-15 James Henstridge * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject. diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index 5df25c3be6..471ced65d5 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -1304,7 +1304,7 @@ gdk_fb_draw_image (GdkDrawable *drawable, static gint gdk_fb_get_depth (GdkDrawable *drawable) { - return GDK_DRAWABLE_IMPL_FBDATA (drawable)->depth; + return GDK_DRAWABLE_FBDATA (drawable)->depth; } static GdkVisual* diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c index a698f11a4b..10609fa001 100644 --- a/gdk/linux-fb/gdkimage-fb.c +++ b/gdk/linux-fb/gdkimage-fb.c @@ -184,7 +184,7 @@ _gdk_fb_get_image (GdkDrawable *drawable, image->visual = gdk_drawable_get_visual (drawable); image->width = width; image->height = height; - image->bits_per_pixel = GDK_DRAWABLE_IMPL_FBDATA (gdk_parent_root)->depth; + image->bits_per_pixel = GDK_DRAWABLE_FBDATA (drawable)->depth; image->depth = image->bits_per_pixel; if (image->bits_per_pixel <= 8)