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

Remove the attempt-to-allocate then free code. To handle multiple people

Browse Source 
Thu Jan 30 16:01:29 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
        attempt-to-allocate then free code. To handle multiple
        people allocating colors at the same time, we need
        to just go ahead and try. (#102213, Shivram U)
This commit is contained in:
Owen Taylor
2003-01-30 21:19:46 +00:00
committed by Owen Taylor
parent 9ca772ac70
commit a04c0bb35f
6 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Jan 30 16:01:29 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
attempt-to-allocate then free code. To handle multiple
people allocating colors at the same time, we need
to just go ahead and try. (#102213, Shivram U)
2003-01-30 Daniel Elstner <daniel.elstner@gmx.net> 2003-01-30 Daniel Elstner <daniel.elstner@gmx.net>
* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque * gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Thu Jan 30 16:01:29 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
attempt-to-allocate then free code. To handle multiple
people allocating colors at the same time, we need
to just go ahead and try. (#102213, Shivram U)
2003-01-30 Daniel Elstner <daniel.elstner@gmx.net> 2003-01-30 Daniel Elstner <daniel.elstner@gmx.net>
* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque * gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Thu Jan 30 16:01:29 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
attempt-to-allocate then free code. To handle multiple
people allocating colors at the same time, we need
to just go ahead and try. (#102213, Shivram U)
2003-01-30 Daniel Elstner <daniel.elstner@gmx.net> 2003-01-30 Daniel Elstner <daniel.elstner@gmx.net>
* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque * gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Thu Jan 30 16:01:29 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
attempt-to-allocate then free code. To handle multiple
people allocating colors at the same time, we need
to just go ahead and try. (#102213, Shivram U)
2003-01-30 Daniel Elstner <daniel.elstner@gmx.net> 2003-01-30 Daniel Elstner <daniel.elstner@gmx.net>
* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque * gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Thu Jan 30 16:01:29 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_try_colormap): Remove the
attempt-to-allocate then free code. To handle multiple
people allocating colors at the same time, we need
to just go ahead and try. (#102213, Shivram U)
2003-01-30 Daniel Elstner <daniel.elstner@gmx.net> 2003-01-30 Daniel Elstner <daniel.elstner@gmx.net>
* gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque * gtk/gtkcolorsel.c (palette_paint): Explicitely draw an opaque

16
gdk/gdkrgb.c
View File

@ -277,22 +277,6 @@ gdk_rgb_try_colormap (GdkRgbInfo *image_info, gboolean force,
} }
#endif #endif
if (colors_needed &&
image_info->visual->type != GDK_VISUAL_STATIC_COLOR)
{
if (!gdk_colors_alloc (cmap, 0, NULL, 0, junk, colors_needed))
{
char tmp_str[80];
g_snprintf (tmp_str, 80,
"%d %d %d colormap failed (in gdk_colors_alloc)\n",
nr, ng, nb);
return gdk_rgb_cmap_fail (tmp_str, cmap, pixels);
}
gdk_colors_free (cmap, junk, colors_needed, 0);
}
for (r = 0, i = 0; r < nr; r++) for (r = 0, i = 0; r < nr; r++)
for (g = 0; g < ng; g++) for (g = 0; g < ng; g++)
for (b = 0; b < nb; b++, i++) for (b = 0; b < nb; b++, i++)