diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-12-05 03:41:29 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-12-05 03:41:29 +0000 |
| commit | 4898375b8be725ccc83dff5c3b020e555148ddb7 (patch) | |
| tree | 183b8be01500f946055ebc30fe916e782e34756b | |
| parent | f5e62ac0f993badf002683a4448825438c16bbf6 (diff) | |
| download | pango-4898375b8be725ccc83dff5c3b020e555148ddb7.tar.gz | |
Bug 501575 – Compile errors Patch from Jens Granseuer
2007-12-04 Behdad Esfahbod <behdad@gnome.org>
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | pango/opentype/harfbuzz-stream.c | 4 | ||||
| -rw-r--r-- | pango/pango-utils.c | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2007-12-04 Behdad Esfahbod <behdad@gnome.org> + + 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 <behdad@gnome.org> * === Released 1.19.1 === diff --git a/pango/opentype/harfbuzz-stream.c b/pango/opentype/harfbuzz-stream.c index 29d280ae..f8a19b5b 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 1776ab9f..0975af94 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)) |