diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-17 12:10:35 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-17 12:10:35 +0000 |
commit | beba2700adbd1ef654015569b2b8724caf06a7f3 (patch) | |
tree | 8af85f648ba7494bb852542ca97b5854a9e40f02 /Build/source/texk/ttfdump/libttf | |
parent | 2c986f639a8f86eb48df7aeef0868b7648646d1a (diff) |
texk/ttfdump: Build fix: Avoid printf("%s",NULL)
git-svn-id: svn://tug.org/texlive/trunk@36546 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ttfdump/libttf')
-rw-r--r-- | Build/source/texk/ttfdump/libttf/ttc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/texk/ttfdump/libttf/ttc.c b/Build/source/texk/ttfdump/libttf/ttc.c index e4625e540bc..09295af270f 100644 --- a/Build/source/texk/ttfdump/libttf/ttc.c +++ b/Build/source/texk/ttfdump/libttf/ttc.c @@ -15,6 +15,8 @@ /* $Id: ttc.c,v 1.1.1.1 1998/06/05 07:47:52 robert Exp $ */ +static void ttfLoadTTCFont(TTCHeaderPtr ttc, FILE *fp, const char *filename); + TTCHeaderPtr ttfLoadTTCHeader(char * filename) { ULONG tag = FT_MAKE_TAG ('t', 't', 'c', 'f'); @@ -34,7 +36,7 @@ TTCHeaderPtr ttfLoadTTCHeader(char * filename) ttc->version = ttfGetFixed(fp); ttc->DirCount = (USHORT) ttfGetULONG(fp); ttc->offset = ttfMakeULONG (ttc->DirCount, fp); - ttfLoadTTCFont(ttc,fp); + ttfLoadTTCFont(ttc,fp,filename); return ttc; } else @@ -42,9 +44,9 @@ TTCHeaderPtr ttfLoadTTCHeader(char * filename) return NULL; } -void ttfLoadTTCFont(TTCHeaderPtr ttc,FILE *fp) +static void ttfLoadTTCFont(TTCHeaderPtr ttc,FILE *fp,const char *filename) { - int i; + unsigned int i; ttc->font = XCALLOC (ttc->DirCount, TTFont); @@ -53,6 +55,8 @@ void ttfLoadTTCFont(TTCHeaderPtr ttc,FILE *fp) for (i=0;i<ttc->DirCount;i++) { (ttc->font+i) -> fp = fp; + (ttc->font+i) -> ttfname = XTALLOC (strlen(filename)+16, char); + sprintf ((ttc->font+i)->ttfname, "%s:%u", filename, i); ttfLoadFont((ttc->font+i),(ttc->offset)[i]); } } |