diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2015-08-21 13:53:34 +0100 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2015-08-21 13:53:34 +0100 |
| commit | d0d140b0180bfe2c2278f34f5a649a2e7d9f4fa2 (patch) | |
| tree | 2d86d017dfe76d350fc473cf5c36407ee9191b6b | |
| parent | bf500a961f0cbdb1f5b3ac9bb71080e7613df23d (diff) | |
| download | pango-d0d140b0180bfe2c2278f34f5a649a2e7d9f4fa2.tar.gz | |
Remove remaining uses of g_utf8_strlen()
| -rw-r--r-- | pango/break-thai.c | 7 | ||||
| -rw-r--r-- | pango/pangocoretext-shape.c | 2 | ||||
| -rw-r--r-- | pango/pangowin32-shape.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pango/break-thai.c b/pango/break-thai.c index 4a2d7d7a..659e96e5 100644 --- a/pango/break-thai.c +++ b/pango/break-thai.c @@ -20,7 +20,8 @@ #include "config.h" -#include <pango/pango-break.h> +#include "pango-break.h" +#include "pango-impl-utils.h" #ifdef HAVE_LIBTHAI #include <thai/thwchar.h> @@ -30,7 +31,7 @@ G_LOCK_DEFINE_STATIC (th_brk); /* * tis_text is assumed to be large enough to hold the converted string, - * i.e. it must be at least g_utf8_strlen(text, len)+1 bytes. + * i.e. it must be at least pango_utf8_strlen(text, len)+1 bytes. */ static thchar_t * utf8_to_tis (const char *text, int len, thchar_t *tis_text, int *tis_cnt) @@ -62,7 +63,7 @@ break_thai (const char *text, int *brk_pnts; int cnt; - cnt = g_utf8_strlen (text, len) + 1; + cnt = pango_utf8_strlen (text, len) + 1; tis_text = tis_stack; if (cnt > (int) G_N_ELEMENTS (tis_stack)) diff --git a/pango/pangocoretext-shape.c b/pango/pangocoretext-shape.c index ef066eea..60f6b166 100644 --- a/pango/pangocoretext-shape.c +++ b/pango/pangocoretext-shape.c @@ -401,7 +401,7 @@ _pango_core_text_shape (PangoFont *font, return; /* Translate the glyph list to a PangoGlyphString */ - n_chars = g_utf8_strlen (text, length); + n_chars = pango_utf8_strlen (text, length); pango_glyph_string_set_size (glyphs, n_chars); glyph_iter = glyph_list; diff --git a/pango/pangowin32-shape.c b/pango/pangowin32-shape.c index aa69d2c7..fbd00124 100644 --- a/pango/pangowin32-shape.c +++ b/pango/pangowin32-shape.c @@ -34,6 +34,7 @@ extern HFONT _pango_win32_font_get_hfont (PangoFont *font); #include "pango-utils.h" +#include "pango-impl-utils.h" static gboolean pango_win32_debug = FALSE; @@ -673,7 +674,7 @@ _pango_win32_shape (PangoFont *font, uniscribe_shape (font, text, length, analysis, glyphs)) return; - n_chars = g_utf8_strlen (text, length); + n_chars = pango_utf8_strlen (text, length); pango_glyph_string_set_size (glyphs, n_chars); |