summaryrefslogtreecommitdiff
path: root/gdk/gdkrgb.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-09-15 17:08:38 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-09-15 17:08:38 +0000
commiteacc9f5d0585708e71ae822a6404c2fd62e0cf15 (patch)
treed4994073c8cd8a3c364360aacf1a07c26065144a /gdk/gdkrgb.c
parenta2524578cd3848e83496e9fa9428e9ccb40ba1e6 (diff)
downloadgtk+-eacc9f5d0585708e71ae822a6404c2fd62e0cf15.tar.gz
Reverted global changes of g_new to malloc(), added back in the one place
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Reverted global changes of g_new to malloc(), added back in the one place where it actually mattered. #include <stdlib.h>. * gdk/gdkrgb.c: g_malloc() to malloc() as above.
Diffstat (limited to 'gdk/gdkrgb.c')
-rw-r--r--gdk/gdkrgb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 46653b6ead..becabbb20e 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -24,6 +24,7 @@
#include <math.h>
#include <stdio.h>
+#include <stdlib.h>
#define ENABLE_GRAYSCALE
@@ -628,8 +629,9 @@ gdk_rgb_init (void)
for (i = 0; i < N_IMAGES; i++)
if (image_info->bitmap)
+ /* Use malloc() instead of g_malloc since X will free() this mem */
static_image[i] = gdk_image_new_bitmap (image_info->visual,
- g_malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
+ malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
IMAGE_WIDTH, IMAGE_HEIGHT);
else
static_image[i] = gdk_image_new (GDK_IMAGE_FASTEST,