From 32dc15fa62d94c88f0b62bfe4d64ba60fe1733a6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 16 Feb 2015 23:58:22 -0500 Subject: 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 --- src/cmd/fontsrv/x11.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/cmd/fontsrv/x11.c') 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){ -- cgit v1.2.3