diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-09 17:14:08 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-09 17:14:08 +0000 |
| commit | 6a1d710752a012cb3e2f8646841a583b7d00d87c (patch) | |
| tree | cbaf9eb816b7451228b7aee25243122fb8536fe5 /pango | |
| parent | 4e8c3abb5bd74af3c2503d21b537e0f1ff34eff2 (diff) | |
| download | pango-6a1d710752a012cb3e2f8646841a583b7d00d87c.tar.gz | |
Bug 314548 – pango_shape() is missing const correctness Patch from
2006-02-09 Behdad Esfahbod <behdad@gnome.org>
Bug 314548 – pango_shape() is missing const correctness
Patch from Antoine Dopffer.
* modules/arabic/arabic-fc.c, modules/basic/basic-fc.c,
modules/basic/basic-x.c, modules/hangul/hangul-fc.c,
modules/hebrew/hebrew-fc.c, modules/indic/indic-fc.c,
modules/khmer/khmer-fc.c, modules/syriac/syriac-fc.c,
modules/thai/thai-shaper.c, modules/thai/thai-shaper.h,
modules/tibetan/tibetan-fc.c, pango/pango-context.c,
pango/pango-engine-private.h, pango/pango-engine.c,
pango/pango-engine.h, pango/pango-glyph.h pango/pango-layout.c,
pango/shape.c: Make PangoAnalysis *analysis const in all shaper
interfaces.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-context.c | 2 | ||||
| -rw-r--r-- | pango/pango-engine-private.h | 2 | ||||
| -rw-r--r-- | pango/pango-engine.c | 4 | ||||
| -rw-r--r-- | pango/pango-engine.h | 2 | ||||
| -rw-r--r-- | pango/pango-glyph.h | 2 | ||||
| -rw-r--r-- | pango/pango-layout.c | 1 | ||||
| -rw-r--r-- | pango/shape.c | 2 |
7 files changed, 6 insertions, 9 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index c47cf9ab..49db52a9 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -646,8 +646,6 @@ itemize_state_init (ItemizeState *state, PangoAttrIterator *cached_iter, const PangoFontDescription *desc) { - gunichar *text_ucs4; - long n_chars; state->context = context; state->text = text; diff --git a/pango/pango-engine-private.h b/pango/pango-engine-private.h index d56a092f..5c88a4b1 100644 --- a/pango/pango-engine-private.h +++ b/pango/pango-engine-private.h @@ -31,7 +31,7 @@ void _pango_engine_shape_shape (PangoEngineShape *engine, PangoFont *font, const char *text, int length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs); PangoCoverageLevel _pango_engine_shape_covers (PangoEngineShape *engine, PangoFont *font, diff --git a/pango/pango-engine.c b/pango/pango-engine.c index ed7df7d2..da06a516 100644 --- a/pango/pango-engine.c +++ b/pango/pango-engine.c @@ -63,7 +63,7 @@ _pango_engine_shape_shape (PangoEngineShape *engine, PangoFont *font, const char *text, int length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs) { glyphs->num_glyphs = 0; @@ -99,7 +99,7 @@ fallback_engine_shape (PangoEngineShape *engine, PangoFont *font, const char *text, gint length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs) { int n_chars; diff --git a/pango/pango-engine.h b/pango/pango-engine.h index 591eadff..ae101a13 100644 --- a/pango/pango-engine.h +++ b/pango/pango-engine.h @@ -181,7 +181,7 @@ struct _PangoEngineShapeClass PangoFont *font, const char *text, int length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs); PangoCoverageLevel (*covers) (PangoEngineShape *engine, PangoFont *font, diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h index a3d0772b..1195f135 100644 --- a/pango/pango-glyph.h +++ b/pango/pango-glyph.h @@ -124,7 +124,7 @@ void pango_glyph_string_x_to_index (PangoGlyphString *glyphs, */ void pango_shape (const gchar *text, gint length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs); GList *pango_reorder_items (GList *logical_items); diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 9befbf65..35159e76 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -3384,7 +3384,6 @@ pango_layout_line_unref (PangoLayoutLine *line) private->ref_count--; if (private->ref_count == 0) { - GSList *tmp_list = line->runs; g_slist_foreach (line->runs, (GFunc)free_run, GINT_TO_POINTER (1)); g_slist_free (line->runs); g_slice_free (PangoLayoutLinePrivate, private); diff --git a/pango/shape.c b/pango/shape.c index 6ff3f379..aa712192 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -40,7 +40,7 @@ void pango_shape (const gchar *text, gint length, - PangoAnalysis *analysis, + const PangoAnalysis *analysis, PangoGlyphString *glyphs) { int i; |