public inbox for guile-gtk@sourceware.org
 help / color / mirror / Atom feed
* gdk-image-new-bitmap and malloc
@ 2003-07-07 22:31 Kevin Ryde
  0 siblings, 0 replies; only message in thread
From: Kevin Ryde @ 2003-07-07 22:31 UTC (permalink / raw)
  To: guile-gtk

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

A bit of a bug fix,

        * gdk-support.c (gdk_image_new_bitmap_interp): Copy data into a
        malloced block, as demanded by gdk_image_new_bitmap.


[-- Attachment #2: gdk-support.c.image-bitmap.diff --]
[-- Type: text/plain, Size: 794 bytes --]

--- gdk-support.c.~1.24.~	2003-06-19 11:03:47.000000000 +1000
+++ gdk-support.c	2003-07-07 17:56:13.000000000 +1000
@@ -1122,10 +1122,15 @@
 gdk_image_new_bitmap_interp (GdkVisual *visual, guchar data[], int count,
 			     gint width, gint height)
 {
+  static const char func_name[] = "gdk-image-new-bitmap";
+  gpointer  m_data;
   if (count * 8 < width * height)
-    scm_misc_error ("gdk-image-new-bitmap", "source bitmap is too small",
-		    SCM_EOL);
-  return gdk_image_new_bitmap (visual, data, width, height);
+    scm_misc_error (func_name, "source bitmap is too small", SCM_EOL);
+  m_data = malloc (count);
+  if (m_data == NULL)
+    scm_memory_error (func_name);
+  memcpy (m_data, data, count);
+  return gdk_image_new_bitmap (visual, m_data, width, height);
 }
 
 GdkBitmap *

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-07-07 22:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-07 22:31 gdk-image-new-bitmap and malloc Kevin Ryde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).