diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-06-18 23:57:51 +0200 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-06-18 23:57:51 +0200 |
| commit | 7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2 (patch) | |
| tree | ff18b856a35c80a9cc40573c76899d8a468bedc5 /src/cmd/fontsrv/mac.c | |
| parent | ea23656f7c3afcfd8516b00c0db09879ae80a09f (diff) | |
| parent | 329831171dd6ef81c113f101093c7b4947381003 (diff) | |
| download | plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.tar.gz plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.tar.bz2 plan9port-7cda34cf34f3afbd3f2000aa5e2b59ddc319f0f2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/fontsrv/mac.c')
| -rw-r--r-- | src/cmd/fontsrv/mac.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cmd/fontsrv/mac.c b/src/cmd/fontsrv/mac.c index b4dadd90..9829b5a8 100644 --- a/src/cmd/fontsrv/mac.c +++ b/src/cmd/fontsrv/mac.c @@ -200,9 +200,12 @@ load(XFont *f) f->loadheight = fontheight; // enable all Unicode ranges + if(nelem(f->file) > 0xffff) + sysfatal("too many subfiles"); // f->file holds ushorts for(i=0; i<nelem(f->range); i++) { f->range[i] = 1; - f->nrange++; + f->file[i] = i; + f->nfile++; } } @@ -233,7 +236,6 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) if(font == nil) return nil; - bbox = CTFontGetBoundingBox(font); x = (int)(bbox.size.width*2 + 0.99999999); |