diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-12 23:45:34 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-12 23:45:34 +0000 |
| commit | 84edb7cb9a67dfd10857e9503ec953c05d870341 (patch) | |
| tree | 6d7ea6e6aea099af10eb9125975268139e20bea3 /modules/basic/basic.c | |
| parent | f726b8d49d00e325314ee6f17cf1f7eaed1fd019 (diff) | |
| download | pango-84edb7cb9a67dfd10857e9503ec953c05d870341.tar.gz | |
Remove checks for iconv - we now depend on g_iconv wrapper defined in
Sun Nov 12 18:36:38 2000 Owen Taylor <otaylor@redhat.com>
* configure.in (included_modules): Remove checks
for iconv - we now depend on g_iconv wrapper defined
in GLib.
* modules/basic/basic.c: Use g_iconv_* not iconv().
* pango/itemize.c pango/pango-context.c modules/thai/thai.c:
Remove spurious iconv.h includes.
Diffstat (limited to 'modules/basic/basic.c')
| -rw-r--r-- | modules/basic/basic.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/modules/basic/basic.c b/modules/basic/basic.c index f044043b..06907bfb 100644 --- a/modules/basic/basic.c +++ b/modules/basic/basic.c @@ -19,8 +19,6 @@ * Boston, MA 02111-1307, USA. */ -#include <iconv.h> - #include <glib.h> #include "pango.h" #include "pangox.h" @@ -63,7 +61,7 @@ struct _MaskTable struct _CharCache { MaskTable *mask_tables[256]; - iconv_t converters[MAX_CHARSETS]; + GIConv converters[MAX_CHARSETS]; }; static PangoGlyph conv_8bit (CharCache *cache, @@ -135,7 +133,7 @@ char_cache_new (void) result = g_new0 (CharCache, 1); for (i=0; i<MAX_CHARSETS; i++) - result->converters[i] = (iconv_t)-1; + result->converters[i] = (GIConv)-1; return result; } @@ -155,8 +153,8 @@ char_cache_free (CharCache *cache) } for (i=0; i<MAX_CHARSETS; i++) - if (cache->converters[i] != (iconv_t)-1) - iconv_close (cache->converters[i]); + if (cache->converters[i] != (GIConv)-1) + g_iconv_close (cache->converters[i]); g_free (cache); } @@ -244,14 +242,14 @@ set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGl glyphs->glyphs[i].geometry.width = logical_rect.width; } -static iconv_t +static GIConv find_converter (CharCache *cache, Charset *charset) { - iconv_t cd = cache->converters[charset->index]; - if (cd == (iconv_t)-1) + GIConv cd = cache->converters[charset->index]; + if (cd == (GIConv)-1) { - cd = iconv_open (charset->id, "UTF-8"); - g_assert (cd != (iconv_t)-1); + cd = g_iconv_open (charset->id, "UTF-8"); + g_assert (cd != (GIConv)-1); cache->converters[charset->index] = cd; } @@ -263,7 +261,7 @@ conv_8bit (CharCache *cache, Charset *charset, const char *input) { - iconv_t cd; + GIConv cd; char outbuf; const char *inptr = input; @@ -275,7 +273,7 @@ conv_8bit (CharCache *cache, cd = find_converter (cache, charset); - iconv (cd, (const char **)&inptr, &inbytesleft, &outptr, &outbytesleft); + g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft); return (guchar)outbuf; } @@ -285,7 +283,7 @@ conv_euc (CharCache *cache, Charset *charset, const char *input) { - iconv_t cd; + GIConv cd; char outbuf[2]; const char *inptr = input; @@ -297,7 +295,7 @@ conv_euc (CharCache *cache, cd = find_converter (cache, charset); - iconv (cd, &inptr, &inbytesleft, &outptr, &outbytesleft); + g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft); if ((guchar)outbuf[0] < 128) return outbuf[0]; |