o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fontsrv: work around a few crashes

Browse source 
Probably not the right fix, but gets us going.

R=rsc
http://codereview.appspot.com/6782113
This commit is contained in:
Russ Cox 2012-11-25 22:45:32 -05:00
parent c6d1f20537
commit e19fde3584
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/fontsrv/osx.c
View file

@ -183,10 +183,10 @@ mksubfont(char *name, int lo, int hi, int size, int antialias)
x = (int)(bbox.size.width * size / unit + 0.99999999); x = (int)(bbox.size.width * size / unit + 0.99999999);
y = bbox.size.height * size/unit + 0.99999999; y = bbox.size.height * size/unit + 0.99999999;
y0 = (int)(-bbox.origin.y * size/unit + 0.99999999); y0 = (int)(-bbox.origin.y * size/unit + 0.99999999);
m = allocmemimage(Rect(0, 0, x*(hi+1-lo), y), GREY8); m = allocmemimage(Rect(0, 0, x*(hi+1-lo)+1, y+1), GREY8);
if(m == nil) if(m == nil)
return nil; return nil;
mc = allocmemimage(Rect(0, 0, x, y), GREY8); mc = allocmemimage(Rect(0, 0, x+1, y+1), GREY8);
if(mc == nil) if(mc == nil)
return nil; return nil;
memfillcolor(m, DBlack); memfillcolor(m, DBlack);
@ -272,6 +272,10 @@ mksubfont(char *name, int lo, int hi, int size, int antialias)
// round up to 32-bit boundary // round up to 32-bit boundary
// so that in-memory data is same // so that in-memory data is same
// layout as in-file data. // layout as in-file data.
if(x == 0)
x = 1;
if(y == 0)
y = 1;
if(antialias) if(antialias)
x += -x & 3; x += -x & 3;
else else