From 25edf235f090a95f30ea877aa00bc7ee642d4cc5 Mon Sep 17 00:00:00 2001 From: Bertram Felgenhauer Date: Thu, 1 Sep 2005 06:13:46 +0000 Subject: [PATCH] Add missing pair of braces. This fixes a crash on text output. --- ChangeLog | 5 +++++ src/cairo-scaled-font.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c10fa933..4bc578e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-01 Bertram Felgenhauer + + * src/cairo-scaled-font.c (_cairo_scaled_font_text_to_glyphs): + Add missing pair of braces. This fixes a crash on text output. + 2005-09-01 Carl Worth * test/cairo-test.h: Add includes to get sized-integer types such diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index e4d8bee32..073dc98e8 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -1,4 +1,4 @@ -/* $Id: cairo-scaled-font.c,v 1.2 2005-09-01 02:11:22 otaylor Exp $ +/* $Id: cairo-scaled-font.c,v 1.3 2005-09-01 13:13:46 inte Exp $ * * Copyright © 2005 Keith Packard * @@ -659,13 +659,14 @@ _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, 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)