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

free subfonts correctly

Browse source
This commit is contained in:
rsc 2005-07-13 03:57:24 +00:00
parent 3b634dc7e4
commit b2f9ee0de5
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libdraw/subfont.c
View file

@ -5,13 +5,14 @@
Subfont*
allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i)
{
Subfont *f;
Subfont *f, *cf;
assert(height != 0 /* allocsubfont */);
f = malloc(sizeof(Subfont));
if(f == 0)
return 0;
fprint(2, "allocsubfont %p\n", f);
f->n = n;
f->height = height;
f->ascent = ascent;
@ -19,9 +20,18 @@ allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i
f->bits = i;
f->ref = 1;
if(name){
/*
* if already caching this subfont, leave older
* (and hopefully more widely used) copy in cache.
* this case should not happen -- we got called
* because cachechars needed this subfont and it
* wasn't in the cache.
*/
f->name = strdup(name);
if(lookupsubfont(i->display, name) == 0)
if((cf=lookupsubfont(i->display, name)) == 0)
installsubfont(name, f);
else
freesubfont(cf); /* drop ref we just picked up */
}else
f->name = 0;
return f;