[cairo] Patches for compilation in Win32

[Behdad Esfahbod]

diff --git a/test/font-matrix-translation.c
b/test/font-matrix-translation.c
index 06b407d..1da49bd 100644
--- a/test/font-matrix-translation.c
+++ b/test/font-matrix-translation.c
@@ -54,7 +54,7 @@ static cairo_test_status_t
 box_text (cairo_t *cr, const char *utf8, double x, double y)
 {
     double line_width;
-    cairo_text_extents_t extents = {}, scaled_extents = {};
+    cairo_text_extents_t extents, scaled_extents;
     cairo_scaled_font_t *scaled_font;
 
     cairo_save (cr);

This change is wrong.  The correct fix is:

diff --git a/test/font-matrix-translation.c
b/test/font-matrix-translation.c
index 06b407d..1da49bd 100644
--- a/test/font-matrix-translation.c
+++ b/test/font-matrix-translation.c
@@ -54,7 +54,7 @@ static cairo_test_status_t
 box_text (cairo_t *cr, const char *utf8, double x, double y)
 {
     double line_width;
-    cairo_text_extents_t extents = {}, scaled_extents = {};
+    cairo_text_extents_t extents = {0}, scaled_extents = {0};
     cairo_scaled_font_t *scaled_font;
 
     cairo_save (cr);



Also, including cairoint.h in perf tests is all wrong.  Why do you need
it?


behdad


On Wed, 2008-02-06 at 17:23 -0500, Antoine Azar wrote:
> Hey Behdad,
> 
> Here's finally the Win32 patch. Fixes compilation and linking errors, 
> and adds debug and release configs to the win32 makefiles.
> 
> There's still the getopt error present on Win32 which I bypass on my 
> local machine with code from GNU's C library. It would be good to 
> check if we can either include it in the perf code (license issues?) 
> or parse command line arguments without it.
> 
> Thanks,
> Antoine
> 
> At 04:10 AM 2/6/2008, Antoine Azar wrote:
> >At 03:50 AM 2/6/2008, Antoine Azar wrote:
> >
> > >> > The other one improves the makefiles, removes cairo-operator.c from
> > >> > the Makefiles, and fixes a variable definition that VC++ doesn't
> > >> seem to like.
> > >>
> > >>This one doesn't apply anymore.  Can you send an updated one?
> > >
> > >
> > >I had a mighty fight with git but my rebase seems (hopefully)
> > >correct now. Here's a new patch.
> >
> >Actually scratch that, I just noticed another change I had in a
> >previous commit that'll probably prevent you from applying the patch.
> >I'll fix it and send another one later.
> >
> >Antoine
> >
> >_______________________________________________
> >cairo mailing list
> >cairo at cairographics.org
> >http://lists.cairographics.org/mailman/listinfo/cairo
> _______________________________________________
> cairo mailing list
> cairo at cairographics.org
> http://lists.cairographics.org/mailman/listinfo/cairo
-- 
behdad
http://behdad.org/

"Those who would give up Essential Liberty to purchase a little
 Temporary Safety, deserve neither Liberty nor Safety."
        -- Benjamin Franklin, 1759