Initialize image->bits_per_pixel from the drawable, not from the root

2001-07-26  Alex Larsson  <alexl@redhat.com>

	* 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.
This commit is contained in:
Alex Larsson 2001-07-26 20:07:08 +00:00 committed by Alexander Larsson
parent e70939234c
commit c16e87bcba
9 changed files with 65 additions and 2 deletions

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -1,3 +1,12 @@
2001-07-26 Alex Larsson <alexl@redhat.com>
* 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 <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

View File

@ -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*

View File

@ -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)