[cairo-commit] pixman/src src/cairo-font-subset.c

[Carl Worth]

 pixman/src/fbcompose.c  |    9 +++++----
 src/cairo-font-subset.c |    4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
diff-tree 7285499700a4f0f4bb95f003d0c730246bf3eabd (from 20e3a99bbaa2624ecad7b505158edc8dce706ea8)
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Jun 29 05:07:51 2006 +0200

    Squelch some bogus compiler warnings about possibly uninitialized values.

diff --git a/pixman/src/fbcompose.c b/pixman/src/fbcompose.c
index 46a34ec..03bb5d5 100644
--- a/pixman/src/fbcompose.c
+++ b/pixman/src/fbcompose.c
@@ -3646,9 +3646,9 @@ fbCompositeRect (const FbComposeData *da
     scanFetchProc fetchSrc = NULL, fetchMask = NULL, fetchDest = NULL;
     unsigned int srcClass  = SourcePictClassUnknown;
     unsigned int maskClass = SourcePictClassUnknown;
-    FbBits *bits;
-    FbStride stride;
-    int	xoff, yoff;
+    FbBits *bits = NULL;    /* squelch bogus compiler warning */
+    FbStride stride = 0;    /* squelch bogus compiler warning */
+    int	xoff = 0, yoff = 0; /* squelch bogus compiler warning */
 
     if (data->op == PIXMAN_OPERATOR_CLEAR)
         fetchSrc = NULL;
@@ -3814,7 +3814,8 @@ fbCompositeRect (const FbComposeData *da
     }
     else
     {
-	CARD32 *src_mask_buffer, *mask_buffer = 0;
+	CARD32 *src_mask_buffer = 0; /* squelch bogus compiler warning */
+	CARD32 *mask_buffer = 0;
 	CombineFuncU compose = composeFunctions.combineU[data->op];
 	if (!compose)
 	    return;
diff --git a/src/cairo-font-subset.c b/src/cairo-font-subset.c
index f7b9105..dc21d14 100644
--- a/src/cairo-font-subset.c
+++ b/src/cairo-font-subset.c
@@ -747,8 +747,8 @@ _cairo_truetype_subset_init (cairo_truet
 {
     cairo_pdf_ft_font_t *font;
     cairo_status_t status;
-    const char *data;
-    unsigned long length, parent_glyph;
+    const char *data = NULL; /* squelch bogus compiler warning */
+    unsigned long parent_glyph, length = 0; /* squelch bogus compiler warning */
     int i;
 
     status = _cairo_pdf_ft_font_create (font_subset, &font);