diff options
| author | Russ Cox <rsc@swtch.com> | 2015-02-16 23:58:22 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2015-02-17 05:00:09 +0000 |
| commit | 32dc15fa62d94c88f0b62bfe4d64ba60fe1733a6 (patch) | |
| tree | 4cf16da305ff7a0b30b0896a6ff79b0e9ea65bac /src/cmd/fontsrv/x11.c | |
| parent | 5d86ecd4b7fd8bccc88a06803c7f8ace26a88788 (diff) | |
| download | plan9port-32dc15fa62d94c88f0b62bfe4d64ba60fe1733a6.tar.gz plan9port-32dc15fa62d94c88f0b62bfe4d64ba60fe1733a6.zip | |
fontsrv: use CoreText API on OS X
This gets us font fallback for free and avoids use of a
deprecated API that might go away some day.
Change-Id: I4b9b1a1ce3e6d98bfb407e3baea13f4adfe2c26a
Reviewed-on: https://plan9port-review.googlesource.com/1160
Reviewed-by: Russ Cox <rsc@swtch.com>
Diffstat (limited to 'src/cmd/fontsrv/x11.c')
| -rw-r--r-- | src/cmd/fontsrv/x11.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/cmd/fontsrv/x11.c b/src/cmd/fontsrv/x11.c index 43b013e3..c7acaeb9 100644 --- a/src/cmd/fontsrv/x11.c +++ b/src/cmd/fontsrv/x11.c @@ -102,7 +102,7 @@ load(XFont *f) } Memsubfont* -mksubfont(char *name, int lo, int hi, int size, int antialias) +mksubfont(XFont *xf, char *name, int lo, int hi, int size, int antialias) { XFont *xf, *xfp, *xfe; FT_Face face; @@ -115,17 +115,6 @@ mksubfont(char *name, int lo, int hi, int size, int antialias) Memsubfont *sf; //Point rect_points[4]; - xf = nil; - for(xfp=xfont, xfe=xfont+nxfont; xfp != xfe; xfp++) { - if(strcmp(xfp->name, name) == 0) { - xf = xfp; - break; - } - } - - if(!xf) - return nil; - e = FT_New_Face(lib, xf->fontfile, xf->index, &face); if(e){ |