Turn the numeric parameter to err_sfntbadglyph from wchar_t to

unsigned int, after a correspondent mentioned that DJGPP produces a
very scary warning about integer promotion making use of the former
in va_arg non-portable. Whether or not that's standards-justifiable,
it's certainly the case that we were casting _to_ wchar_t from
unsigned int in all cases of this error actually being used, so the
simplest thing is just to transfer the number through va_arg as
unsigned.

[originally from svn r8112]

1 files changed, 3 insertions, 6 deletions

diff --git a/in_sfnt.c b/in_sfnt.c
index fc37dc0..0d2c7d5 100644
--- a/in_sfnt.c
+++ b/in_sfnt.c
@@ -886,8 +886,7 @@ void sfnt_getmap(font_info *fi) {
 			    idx = (k + idDelta[j]) & 0xffff;
 			    if (idx != 0) {
 				if (idx > sf->nglyphs)  {
-				    error(err_sfntbadglyph, &sf->pos,
-					  (wchar_t)k);
+				    error(err_sfntbadglyph, &sf->pos, k);
 				    continue;
 				}
 				fi->bmp[k] = sfnt_indextoglyph(sf, idx);
@@ -898,16 +897,14 @@ void sfnt_getmap(font_info *fi) {
 			for (k = startCode[j]; k <= endCode[j]; k++) {
 			    if (startidx + k - startCode[j] >=
 				nglyphindex) {
-				error(err_sfntbadglyph, &sf->pos,
-				      (wchar_t)k);
+				error(err_sfntbadglyph, &sf->pos, k);
 				continue;
 			    }
 			    idx = glyphIndexArray[startidx + k - startCode[j]];
 			    if (idx != 0) {
 				idx = (idx + idDelta[j]) & 0xffff;
 				if (idx > sf->nglyphs) {
-				    error(err_sfntbadglyph, &sf->pos,
-					  (wchar_t)k);
+				    error(err_sfntbadglyph, &sf->pos, k);
 				    continue;
 				}
 				fi->bmp[k] = sfnt_indextoglyph(sf, idx);