~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a bunch of unused variables spotted by Ubuntu 12.04's gcc.
[sgt/halibut]
/
in_sfnt.c
diff --git
a/in_sfnt.c
b/in_sfnt.c
index
fc37dc0
..
0d2c7d5
100644
(file)
--- 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) {
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);
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) {
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) {
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);
continue;
}
fi->bmp[k] = sfnt_indextoglyph(sf, idx);