diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-09 17:12:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-09 17:12:32 +0100 |
| commit | 63c3a3a61863ccdc2ff3ab6a9f34d4a6fb72a8c8 (patch) | |
| tree | c2ec625befefca3759575095264161ffc2267572 /mkfontscale/ident.c | |
| parent | 2ae775fec514a032da4e6ec7528c2ef98c3913ee (diff) | |
| parent | a1e97828c89278770cb249039ec92d959440c640 (diff) | |
| download | vcxsrv-63c3a3a61863ccdc2ff3ab6a9f34d4a6fb72a8c8.tar.gz vcxsrv-63c3a3a61863ccdc2ff3ab6a9f34d4a6fb72a8c8.tar.bz2 vcxsrv-63c3a3a61863ccdc2ff3ab6a9f34d4a6fb72a8c8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mkfontscale/ident.c')
| -rw-r--r-- | mkfontscale/ident.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkfontscale/ident.c b/mkfontscale/ident.c index 15fb76be2..bf544832c 100644 --- a/mkfontscale/ident.c +++ b/mkfontscale/ident.c @@ -142,8 +142,8 @@ fontFileSeek(fontFile *ff, z_off_t offset, int whence) break; default: return -1; - } - + } + while (n > BUFSIZ) { if (BZ2_bzread(ff->f.bz2, buf, BUFSIZ) != BUFSIZ) return -1; @@ -221,7 +221,7 @@ getInt32(fontFile *f, int format) } } -int +int bitmapIdentify(const char *filename, char **name) { fontFile ff; @@ -270,7 +270,7 @@ pcfIdentify(fontFile *f, char **name) rc = fontFileSeek(f, prop_position, SEEK_SET); if(rc < 0) goto fail; - + format = getLSB32(f); if((format & 0xFFFFFF00) != 0) goto fail; @@ -428,7 +428,7 @@ bdfIdentify(fontFile *f, char **name) while(1) { if(!eol) { rc = bdfskip(f); - if(rc < 0) + if(rc < 0) goto fail; } k = getKeyword(f, &eol); |