[cairo-commit] cairo/src cairo-scaled-font.c,1.2,1.3

Bertram Felgenhauer commit at pdx.freedesktop.org
Thu Sep 1 06:13:48 PDT 2005


Committed by: inte

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv21328/src

Modified Files:
	cairo-scaled-font.c 
Log Message:
2005-09-01  Bertram Felgenhauer  <int-e at gmx.de>

        * src/cairo-scaled-font.c (_cairo_scaled_font_text_to_glyphs):
        Add missing pair of braces. This fixes a crash on text output.


Index: cairo-scaled-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-scaled-font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo-scaled-font.c	1 Sep 2005 02:11:22 -0000	1.2
+++ cairo-scaled-font.c	1 Sep 2005 13:13:46 -0000	1.3
@@ -659,13 +659,14 @@
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
     cairo_scaled_glyph_t *scaled_glyph;
 
-    if (scaled_font->backend->text_to_glyphs)
+    if (scaled_font->backend->text_to_glyphs) {
 	status = scaled_font->backend->text_to_glyphs (scaled_font,
 						       x, y, utf8,
 						       glyphs, num_glyphs);
 
-    if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	return status;
+        if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+            return status;
+    }
 
     status = _cairo_utf8_to_ucs4 ((unsigned char*)utf8, -1, &ucs4, num_glyphs);
     if (status)



More information about the cairo-commit mailing list