diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-04-04 16:05:02 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-04-04 16:05:02 +0000 |
| commit | 52f2e805bf993f711d09ba6fe4972c7f7ee33eae (patch) | |
| tree | 15e89d657b3f582fd2e8051c198c808b0756a682 /pango/pango-context.c | |
| parent | 2149bad49c6b0603daa2ee90d66a9f37d75f1eb9 (diff) | |
| download | pango-52f2e805bf993f711d09ba6fe4972c7f7ee33eae.tar.gz | |
fribidi-0.1.9 wants UCS-4 not UCS2; switch accordingly.
Tue Apr 4 12:01:37 2000 Owen Taylor <otaylor@redhat.com>
* pango/utils.[ch] pango/pango-context.c: fribidi-0.1.9
wants UCS-4 not UCS2; switch accordingly.
Diffstat (limited to 'pango/pango-context.c')
| -rw-r--r-- | pango/pango-context.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index 5343ab27..95c5bab2 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -473,7 +473,7 @@ pango_itemize (PangoContext *context, int length, PangoAttrList *attrs) { - guint16 *text_ucs2; + GUChar4 *text_ucs4; gint n_chars; guint8 *embedding_levels; FriBidiCharType base_dir; @@ -506,8 +506,8 @@ pango_itemize (PangoContext *context, /* First, apply the bidirectional algorithm to break * the text into directional runs. */ - text_ucs2 = _pango_utf8_to_ucs2 (text, length); - if (!text_ucs2) + text_ucs4 = _pango_utf8_to_ucs4 (text, length); + if (!text_ucs4) return NULL; n_chars = unicode_strlen (text, length); @@ -522,7 +522,7 @@ pango_itemize (PangoContext *context, fonts = g_new0 (PangoFont *, n_chars); extra_attr_lists = g_new0 (GSList *, n_chars); - fribidi_log2vis_get_embedding_levels (text_ucs2, n_chars, &base_dir, + fribidi_log2vis_get_embedding_levels (text_ucs4, n_chars, &base_dir, embedding_levels); /* Now, fill in the appropriate shapers, language engines and fonts for @@ -595,7 +595,7 @@ pango_itemize (PangoContext *context, g_free (fonts); g_free (extra_attr_lists); - g_free (text_ucs2); + g_free (text_ucs4); return g_list_reverse (result); } |