[cairo-commit] 3 commits - src/cairoint.h src/cairo-win32-font.c src/cairo-win32-private.h

[Adrian Johnson]

 src/cairo-win32-font.c    |    1 +
 src/cairo-win32-private.h |    1 +
 src/cairoint.h            |    3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6e87e354e42d1a758a252533407e6e1829638544
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun May 17 18:14:28 2009 +0930

    Correct the comment for the index_to_ucs4 font backend function

diff --git a/src/cairoint.h b/src/cairoint.h
index f1ba063..d694ae4 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -490,7 +490,8 @@ struct _cairo_scaled_font_backend {
                            unsigned char        *buffer,
                            unsigned long        *length);
 
-    /* returns -1 if the unicode character could not be found for the glyph */
+    /* ucs4 is set to -1 if the unicode character could not be found
+     * for the glyph */
     cairo_warn cairo_int_status_t
     (*index_to_ucs4)(void                       *scaled_font,
 		     unsigned long               index,
commit 2a34992cccfd77c2acf30fe851311f16137ba32f
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun May 17 18:12:39 2009 +0930

    Ensure win32 font index_to_ucs4() sets ucs4 to -1 if lookup fails

diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index e0ece5b..d99c261 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -1543,6 +1543,7 @@ _cairo_win32_scaled_font_index_to_ucs4 (void		*abstract_font,
 	goto exit1;
     }
 
+    *ucs4 = (uint32_t) -1;
     for (i = 0; i < glyph_set->cRanges; i++) {
 	num_glyphs = glyph_set->ranges[i].cGlyphs;
 
commit 4c8e5485a10478c19e8a6cb48595473f5bb8ee8a
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun May 17 18:05:42 2009 +0930

    Fix win32 build breakage
    
    that was caused by c25992479aca481d326f72665ebdcf0904273eac

diff --git a/src/cairo-win32-private.h b/src/cairo-win32-private.h
index 51564d0..40ed20e 100644
--- a/src/cairo-win32-private.h
+++ b/src/cairo-win32-private.h
@@ -163,6 +163,7 @@ _cairo_win32_surface_create_similar (void	    *abstract_src,
 cairo_status_t
 _cairo_win32_surface_clone_similar (void *abstract_surface,
 				    cairo_surface_t *src,
+				    cairo_content_t content,
 				    int src_x,
 				    int src_y,
 				    int width,