From b4920271ba414d1a91e2209f3b07c4506980ba3b Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 27 Aug 2004 00:34:15 +0000 Subject: Fixed new font format: necessity of offset table generation, output of fonts without one git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5018 a1c6a512-1295-4272-9138-f99709370657 --- tools/convbdf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/convbdf.c b/tools/convbdf.c index 14561869a2..16af43f3b8 100644 --- a/tools/convbdf.c +++ b/tools/convbdf.c @@ -393,7 +393,7 @@ int bdf_read_header(FILE *fp, struct font* pf) fprintf(stderr, "Error: bad 'ENCODING'\n"); return 0; } - if (encoding >= 0 && + if (encoding >= 0 && encoding <= limit_char && encoding >= start_char) { @@ -595,6 +595,16 @@ int bdf_read_bitmaps(FILE *fp, struct font* pf) } /* determine whether font doesn't require encode table*/ +#ifdef ROTATE + l = 0; + for (i=0; isize; ++i) { + if (pf->offrot[i] != l) { + encodetable = 1; + break; + } + l += pf->maxwidth * (pf->height + 7) / 8; + } +#else l = 0; for (i=0; isize; ++i) { if (pf->offset[i] != l) { @@ -603,6 +613,7 @@ int bdf_read_bitmaps(FILE *fp, struct font* pf) } l += BITMAP_WORDS(pf->width[i]) * pf->height; } +#endif if (!encodetable) { free(pf->offset); pf->offset = NULL; -- cgit v1.2.3