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

Catch directfb errors in gdk_colormap_new

Browse Source 
Patch by Andre Draszik, bug 609172.
This commit is contained in:
Matthias Clasen 2010-02-23 13:05:24 -05:00
parent e06edf375a
commit 3d66034d7d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/directfb/gdkcolor-directfb.c
View File

@ -119,9 +119,16 @@ gdk_colormap_new (GdkVisual *visual,
{ {
case GDK_VISUAL_PSEUDO_COLOR: case GDK_VISUAL_PSEUDO_COLOR:
{ {
IDirectFB *dfb = _gdk_display->directfb;
IDirectFBPalette *palette;
GdkColormapPrivateDirectFB *private; GdkColormapPrivateDirectFB *private;
DFBPaletteDescription dsc; DFBPaletteDescription dsc;
dsc.flags = DPDESC_SIZE;
dsc.size = colormap->size;
if (!dfb->CreatePalette (dfb, &dsc, &palette))
return NULL;
colormap->colors = g_new0 (GdkColor, colormap->size); colormap->colors = g_new0 (GdkColor, colormap->size);
private = g_new0 (GdkColormapPrivateDirectFB, 1); private = g_new0 (GdkColormapPrivateDirectFB, 1);
@ -133,10 +140,7 @@ gdk_colormap_new (GdkVisual *visual,
private->info[0].ref_count++; private->info[0].ref_count++;
} }
dsc.flags = DPDESC_SIZE; private->palette = palette;
dsc.size = colormap->size;
_gdk_display->directfb->CreatePalette (
_gdk_display->directfb, &dsc, &private->palette);
colormap->windowing_data = private; colormap->windowing_data = private;