Author: jackson
Date: 2005-04-20 17:16:36 -0400 (Wed, 20 Apr 2005)
New Revision: 43358

Modified:
   trunk/libgdiplus/src/ChangeLog
   trunk/libgdiplus/src/hatchbrush.c
Log:
        * hatchbrush.c: Don't require that hatch brushes be created on a
        context with an attached bitmap.



Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog      2005-04-20 20:42:04 UTC (rev 43357)
+++ trunk/libgdiplus/src/ChangeLog      2005-04-20 21:16:36 UTC (rev 43358)
@@ -1,3 +1,8 @@
+2005-04-20  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * hatchbrush.c: Don't require that hatch brushes be created on a
+       context with an attached bitmap.
+
 2005-04-07 Neale Ferguson <[EMAIL PROTECTED]>
 
        * gifcodec.c: Eliminate warning message and optimize breakdown of RGB 
field.

Modified: trunk/libgdiplus/src/hatchbrush.c
===================================================================
--- trunk/libgdiplus/src/hatchbrush.c   2005-04-20 20:42:04 UTC (rev 43357)
+++ trunk/libgdiplus/src/hatchbrush.c   2005-04-20 21:16:36 UTC (rev 43358)
@@ -2277,35 +2277,19 @@
 gdip_hatch_setup (GpGraphics *graphics, GpBrush *brush)
 {
        GpHatch *hbr;
-       GpImage *img;
-       GpBitmap *bmp;
        cairo_t *ct;
-       unsigned int width;
-       unsigned int height;
        int forecol;
        int backcol;
-       cairo_format_t format;
+       cairo_format_t format = CAIRO_FORMAT_ARGB32;
        GpStatus status = Ok;
 
        g_return_val_if_fail (graphics != NULL, InvalidParameter);
        g_return_val_if_fail (brush != NULL, InvalidParameter);
 
-       img = graphics->image;
-
-       g_return_val_if_fail (img != NULL, InvalidParameter);
-
        hbr = (GpHatch *) brush;
        forecol = hbr->foreColor;
        backcol = hbr->backColor;
 
-       if (img->type == imageBitmap) {
-               bmp = (GpBitmap *) img;
-               width = bmp->data.Width;
-               height = bmp->data.Height;
-               format = bmp->data.PixelFormat;
-       } else 
-               return NotImplemented;
-
        ct = graphics->ct;
 
        g_return_val_if_fail (ct != NULL, InvalidParameter);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to