diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-11-12 21:16:39 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-12 21:16:39 +0000 |
commit | f726b8d49d00e325314ee6f17cf1f7eaed1fd019 (patch) | |
tree | 6041b8551149c167352c65fda63c3e7aaeb88d9b /modules/basic/basic.c | |
parent | 1ff8a34d8c98aa47438515abd16f531e838d7404 (diff) | |
download | pango-f726b8d49d00e325314ee6f17cf1f7eaed1fd019.tar.gz |
Include a stripped-down version of fribidi to avoid the extra dependency.
Sun Nov 12 16:07:06 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango/pango-utils.[ch] pango/Makefile.am
pango/mini-fribidi/*: Include a stripped-down version of fribidi
to avoid the extra dependency. No fribidi symbols are
exported so conflicts with the real fribidi should not
happen. Library can optionally be compiled with the
real libfribidi.
* pango/pango-utils.[ch]: Wrappers for
fribidi_ functions when compiling with fribiid.
* modules/basic/basic-ft2.c modules/basic/basic-win32.c
modules/basic/basic.c modules/thai/thai.c pango/Makefile.am
pango/itemize.c pango/pango-context.c pango/pangoft2.c
pango/pangowin32.c pango/pangox.c: Use pango_ versions of fribidi
functions.
Diffstat (limited to 'modules/basic/basic.c')
-rw-r--r-- | modules/basic/basic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/basic/basic.c b/modules/basic/basic.c index 944ec41c..f044043b 100644 --- a/modules/basic/basic.c +++ b/modules/basic/basic.c @@ -24,7 +24,7 @@ #include <glib.h> #include "pango.h" #include "pangox.h" -#include <fribidi/fribidi.h> +#include "pango-utils.h" typedef struct _CharRange CharRange; typedef struct _Charset Charset; @@ -376,7 +376,7 @@ basic_engine_shape (PangoFont *font, for (i=0; i < n_chars; i++) { gunichar wc; - FriBidiChar mirrored_ch; + gunichar mirrored_ch; PangoGlyph index; char buf[6]; const char *input; @@ -385,7 +385,7 @@ basic_engine_shape (PangoFont *font, input = p; if (analysis->level % 2) - if (fribidi_get_mirror_char (wc, &mirrored_ch)) + if (pango_get_mirror_char (wc, &mirrored_ch)) { wc = mirrored_ch; |