From bb90331d11b459d4dfb36e82b1845830ef500066 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 9 Jan 2013 14:51:10 +0000 Subject: xdvipdfmx: Avoid various gcc-4.6 warnings git-svn-id: svn://tug.org/texlive/trunk@28776 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvipdfmx/src/tt_cmap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/xdvipdfmx/src/tt_cmap.c') diff --git a/Build/source/texk/xdvipdfmx/src/tt_cmap.c b/Build/source/texk/xdvipdfmx/src/tt_cmap.c index a95cbe2d0b4..614d26ad72e 100644 --- a/Build/source/texk/xdvipdfmx/src/tt_cmap.c +++ b/Build/source/texk/xdvipdfmx/src/tt_cmap.c @@ -456,13 +456,13 @@ tt_cmap_read (sfnt *sfont, USHORT platform, USHORT encoding) { tt_cmap *cmap = NULL; ULONG offset, length = 0; - USHORT version, p_id, e_id; + USHORT p_id, e_id; USHORT i, n_subtabs; ASSERT(sfont); offset = sfnt_locate_table(sfont, "cmap"); - version = sfnt_get_ushort(sfont); + (void) sfnt_get_ushort(sfont); n_subtabs = sfnt_get_ushort(sfont); for (i = 0; i < n_subtabs; i++) { @@ -856,7 +856,8 @@ handle_subst_glyphs (CMap *cmap, for (count = 0, i = 0; i < 8192; i++) { int j; long len, inbytesleft, outbytesleft; - unsigned char *inbuf, *outbuf; + const unsigned char *inbuf; + unsigned char *outbuf; if (used_glyphs[i] == 0) continue; @@ -898,10 +899,10 @@ handle_subst_glyphs (CMap *cmap, wbuf[1] = gid & 0xff; inbuf = wbuf; inbytesleft = 2; - outbuf = inbuf + 2; + outbuf = wbuf + 2; outbytesleft = WBUF_SIZE - 2; CMap_decode(cmap_add, - (const unsigned char **) &inbuf , &inbytesleft, + &inbuf , &inbytesleft, &outbuf, &outbytesleft); if (inbytesleft != 0) { WARN("CMap conversion failed..."); -- cgit v1.2.3