callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gdk_colormap_sync private since it was never exported in a header

Browse Source 
Fri Feb  2 17:16:09 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkcolor-x11.c (gdk_colormap_sync): Make
	gdk_colormap_sync private since it was never exported
	in a header file.

	* gdk/x11/gdkcolor-x11.c (gdk_colormap_new): Fill in
	colormap->colors[] for StaticGray, StaticColor colormaps.

	* gdk/gdkpixbuf-drawable.c: Fix problems where image->bpp
	was being used as if it was image->bits_per_pixel.

	* gdk/gdkimage.h, gdk/x11/gdkimage-x11.c: Save the bits-per-pixel
	for the image in the GdkImage structure since it isn't
	reconstructable, and we need it to handle packed types

	* gdk/win32/gdkimage-win32.c: Set image->bits_per_pixel. (I'm making
	the assumption that on Win32 image->bits_per_pixel == image->depth,
	always.

	* gdk/linux-fb/gdkimage-fb.c: Set image->bits_per_pixel.

	* gdk/gdkrgb.c (gdk_rgb_select_conv): Exit with an informative
	warning message if no converter can be found.
This commit is contained in:
Owen Taylor
2001-02-02 22:19:31 +00:00
committed by Owen Taylor
parent a1a252ce46
commit a2d1299475
16 changed files with 309 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/linux-fb/gdkimage-fb.c
View File

@ -122,6 +122,7 @@ gdk_image_new_bitmap(GdkVisual *visual,
image->depth = 1;
image->byte_order = 1 /* MSBFirst */;
image->bits_per_pixel = 1;
image->bpp = 1;
image->bpl = (w+7)/8;
image->mem = g_malloc (image->bpl * h / 8);
@ -148,6 +149,7 @@ gdk_image_new (GdkImageType type,
image->depth = visual->depth;
image->byte_order = 0;
image->bits_per_pixel = image->depth;
image->bpp = image->depth/8;
image->bpl = (width * image->depth + 7) / 8;
image->mem = g_malloc (image->bpl * height);
@ -164,7 +166,7 @@ _gdk_fb_get_image (GdkDrawable *drawable,
{
GdkImage *image;
GdkImagePrivateFB *private;
gint bits_per_pixel = GDK_DRAWABLE_IMPL_FBDATA (gdk_parent_root)->depth;
gint bits_per_pixel =
GdkPixmapFBData fbd;
g_return_val_if_fail (drawable != NULL, NULL);
@ -176,13 +178,14 @@ _gdk_fb_get_image (GdkDrawable *drawable,
image->visual = gdk_drawable_get_visual (drawable);
image->width = width;
image->height = height;
image->depth = bits_per_pixel;
image->bits_per_pixel = GDK_DRAWABLE_IMPL_FBDATA (gdk_parent_root)->depth;
image->depth = image->bits_per_pixel;
if (bits_per_pixel <= 8)
if (image->bits_per_pixel <= 8)
image->bpp = 1;
else if (bits_per_pixel <= 16)
else if (image->bits_per_pixel <= 16)
image->bpp = 2;
else if (bits_per_pixel <= 24)
else if (image->bits_per_pixel <= 24)
image->bpp = 3;
else
image->bpp = 4;