Author: spouliot
Date: 2006-07-07 15:56:08 -0400 (Fri, 07 Jul 2006)
New Revision: 62357
Modified:
trunk/libgdiplus/src/ChangeLog
trunk/libgdiplus/src/region-bitmap.c
Log:
region-bitmap.c: Don't show up a warning if we're cloning a region containing
an empty graphicpath (as it is normal that no bitmap would be required);
Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog 2006-07-07 19:55:55 UTC (rev 62356)
+++ trunk/libgdiplus/src/ChangeLog 2006-07-07 19:56:08 UTC (rev 62357)
@@ -3,6 +3,9 @@
* gifcodec.c: Return a GenericError in gdip_save_gif_image if the
pixel_format isn't a know value. This makes sure cmap_size is always
initialized (before being used).
+ * region-bitmap.c: Don't show up a warning if we're cloning a region
+ containing an empty graphicpath (as it is normal that no bitmap would
+ be required);
* tiffcodec.c: Make sure we don't dereference a NULL pointer inside
gdip_load_tiff_image (and properly return OutOfMemory).
Modified: trunk/libgdiplus/src/region-bitmap.c
===================================================================
--- trunk/libgdiplus/src/region-bitmap.c 2006-07-07 19:55:55 UTC (rev
62356)
+++ trunk/libgdiplus/src/region-bitmap.c 2006-07-07 19:56:08 UTC (rev
62357)
@@ -291,10 +291,13 @@
unsigned char *buffer;
int size = (bitmap->Width * bitmap->Height >> 3); /* 1 bit per pixel */
- buffer = alloc_bitmap_memory (size, FALSE);
- if (buffer)
- memcpy (buffer, bitmap->Mask, size);
-
+ if (size > 0) {
+ buffer = alloc_bitmap_memory (size, FALSE);
+ if (buffer)
+ memcpy (buffer, bitmap->Mask, size);
+ } else {
+ buffer = NULL;
+ }
return alloc_bitmap_with_buffer (bitmap->X, bitmap->Y, bitmap->Width,
bitmap->Height, buffer);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
