From 4898375b8be725ccc83dff5c3b020e555148ddb7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 5 Dec 2007 03:41:29 +0000 Subject: [PATCH] =?utf8?q?Bug=20501575=20=E2=80=93=20Compile=20errors=20Pa?= =?utf8?q?tch=20from=20Jens=20Granseuer?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-12-04 Behdad Esfahbod Bug 501575 – Compile errors Patch from Jens Granseuer * pango/opentype/harfbuzz-stream.c (_hb_font_goto_table): * pango/pango-utils.c (handle_alias_line): Fix C99ism. svn path=/trunk/; revision=2514 --- ChangeLog | 9 +++++++++ pango/opentype/harfbuzz-stream.c | 4 ++-- pango/pango-utils.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c7067a..7e5af9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-12-04 Behdad Esfahbod + + Bug 501575 – Compile errors + Patch from Jens Granseuer + + * pango/opentype/harfbuzz-stream.c (_hb_font_goto_table): + * pango/pango-utils.c (handle_alias_line): + Fix C99ism. + 2007-12-03 Behdad Esfahbod * === Released 1.19.1 === diff --git a/pango/opentype/harfbuzz-stream.c b/pango/opentype/harfbuzz-stream.c index 29d280a..f8a19b5 100644 --- a/pango/opentype/harfbuzz-stream.c +++ b/pango/opentype/harfbuzz-stream.c @@ -150,6 +150,8 @@ _hb_font_goto_table( HB_Font font, { HB_Stream stream = font->stream; + HB_UInt offset = 0; + HB_UInt count, nn; HB_Error error; LOG(( "_hb_font_goto_table( %p, %c%c%c%c, %p )\n", @@ -170,8 +172,6 @@ _hb_font_goto_table( HB_Font font, /* parse the directory table directly, without using * FreeType's built-in data structures */ - HB_UInt offset = 0; - HB_UInt count, nn; if ( font->num_faces > 1 ) { diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 1776ab9..0975af9 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -1248,6 +1248,7 @@ handle_alias_line (GString *line_buffer, const char *pos; struct PangoAlias alias_key; struct PangoAlias *alias; + gboolean append = FALSE; char **new_families; int n_new; int i; @@ -1255,7 +1256,6 @@ handle_alias_line (GString *line_buffer, tmp_buffer1 = g_string_new (NULL); tmp_buffer2 = g_string_new (NULL); - gboolean append = FALSE; pos = line_buffer->str; if (!pango_skip_space (&pos)) -- 2.7.4