From 0989d8ed833827100de59d6adb53795a708873c2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 20 Sep 2001 21:05:45 +0000 Subject: [PATCH] Remove unnecessary call to gdk_image_new_bitmap(). Thu Sep 20 16:20:47 2001 Owen Taylor * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary call to gdk_image_new_bitmap(). --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkrgb.c | 12 +++--------- 8 files changed, 38 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b8f4b4d3e1..55dd7b595d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Sep 20 16:20:47 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary + call to gdk_image_new_bitmap(). + Thu Sep 20 15:31:35 2001 Owen Taylor * gtk/gtkcalendar.c (gtk_calendar_init): Use the current diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index bedce4067c..4c178b2175 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -615,15 +615,9 @@ gdk_rgb_allocate_images (GdkRgbInfo *image_info, for (i = 0; i < n_images; i++) { - if (image_info->bitmap) - /* Use malloc() instead of g_malloc since X will free() this mem */ - image_info->static_image[i] = gdk_image_new_bitmap (image_info->visual, - (gpointer) malloc (REGION_WIDTH * REGION_HEIGHT >> 3), - REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT); - else - image_info->static_image[i] = gdk_image_new (shared ? GDK_IMAGE_SHARED : GDK_IMAGE_NORMAL, - image_info->visual, - REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT); + image_info->static_image[i] = gdk_image_new (shared ? GDK_IMAGE_SHARED : GDK_IMAGE_NORMAL, + image_info->visual, + REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT); if (!image_info->static_image[i]) { -- GitLab