diff options
Diffstat (limited to 'src/cmd/fontsrv/osx.c')
| -rw-r--r-- | src/cmd/fontsrv/osx.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/cmd/fontsrv/osx.c b/src/cmd/fontsrv/osx.c index c01ae6ce..b4dadd90 100644 --- a/src/cmd/fontsrv/osx.c +++ b/src/cmd/fontsrv/osx.c @@ -51,7 +51,7 @@ mac2c(CFStringRef s) char *p; int n; - n = CFStringGetLength(s)*8; + n = CFStringGetLength(s)*8; p = malloc(n); CFStringGetCString(s, p, n, kCFStringEncodingUTF8); return p; @@ -93,7 +93,7 @@ loadfonts(void) if(f == nil) continue; s = CTFontDescriptorCopyAttribute(f, kCTFontNameAttribute); - xfont[nxfont].name = mac2c(s); + xfont[nxfont].name = mac2c(s); CFRelease(s); nxfont++; } @@ -147,7 +147,7 @@ fontheight(XFont *f, int size, int *height, int *ascent) CTLineRef line; str = c2mac(lines[i]); - + // See https://developer.apple.com/library/ios/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW2 attrs = CFDictionaryCreate(kCFAllocatorDefault, (const void**)&keys, (const void**)&values, sizeof(keys) / sizeof(keys[0]), @@ -162,15 +162,15 @@ fontheight(XFont *f, int size, int *height, int *ascent) r.size.width += r.origin.x; r.size.height += r.origin.y; CFRelease(line); - + // fprint(2, "%s: %g %g %g %g\n", lines[i], r.origin.x, r.origin.y, r.size.width, r.size.height); - + if(i == 0) bbox = r; if(bbox.origin.x > r.origin.x) - bbox.origin.x = r.origin.x; + bbox.origin.x = r.origin.x; if(bbox.origin.y > r.origin.y) - bbox.origin.y = r.origin.y; + bbox.origin.y = r.origin.y; if(bbox.size.width < r.size.width) bbox.size.width = r.size.width; if(bbox.size.height < r.size.height) @@ -182,7 +182,7 @@ fontheight(XFont *f, int size, int *height, int *ascent) *height = bbox.size.height + 0.999999; *ascent = *height - (-bbox.origin.y + 0.999999); - + CGContextRelease(ctxt); CFRelease(font); } @@ -232,8 +232,8 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) CFRelease(desc); if(font == nil) return nil; - - + + bbox = CTFontGetBoundingBox(font); x = (int)(bbox.size.width*2 + 0.99999999); @@ -295,7 +295,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) sprint(buf, "%C", (Rune)mapUnicode(name, i)); str = c2mac(buf); - + // See https://developer.apple.com/library/ios/documentation/StringsTextFonts/Conceptual/CoreText_Programming/LayoutOperations/LayoutOperations.html#//apple_ref/doc/uid/TP40005533-CH12-SW2 attrs = CFDictionaryCreate(kCFAllocatorDefault, (const void**)&keys, (const void**)&values, sizeof(keys) / sizeof(keys[0]), @@ -309,7 +309,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) CGContextSetTextPosition(ctxt, 0, y0); r = CTLineGetImageBounds(line, ctxt); memfillcolor(mc, DBlack); - CTLineDraw(line, ctxt); + CTLineDraw(line, ctxt); CFRelease(line); fc->x = x; @@ -324,7 +324,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) if(i == 0) { drawpjw(m, fc, x, (int)(bbox.size.width + 0.99999999), y, y - y0); x += fc->width; - } + } continue; } @@ -357,6 +357,6 @@ mksubfont(XFont *f, char *name, int lo, int hi, int size, int antialias) sf->ascent = Dy(m1->r) - y0; sf->info = fc0; sf->bits = m1; - + return sf; } |