ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/font.c
(Generate patch)

Comparing ray/src/common/font.c (file contents):
Revision 2.23 by greg, Sat Nov 20 15:53:24 2021 UTC vs.
Revision 2.26 by greg, Wed Feb 2 00:03:40 2022 UTC

# Line 26 | Line 26 | getfont(                       /* return font fname */
26          char  *fname
27   )
28   {
29 +        char  embuf[512];
30          FILE  *fp;
31          char  *pathname, *err = NULL;
32          unsigned  wsum, hsum, ngly;
# Line 41 | Line 42 | getfont(                       /* return font fname */
42                  }
43                                                  /* load the font file */
44          if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
45 <                sprintf(errmsg, "cannot find font file \"%s\"\n", fname);
46 <                eputs(errmsg);
45 >                sprintf(embuf, "cannot find font file \"%s\"\n", fname);
46 >                eputs(embuf);
47                  return(NULL);
48          }
49          if ((fp = fopen(pathname, "r")) == NULL) {
50 <                sprintf(errmsg, "cannot open font file \"%s\"\n", pathname);
51 <                eputs(errmsg);
50 >                sprintf(embuf, "cannot open font file \"%s\"\n", pathname);
51 >                eputs(embuf);
52                  return(NULL);
53          }
54          f = (FONT *)calloc(1, sizeof(FONT));
# Line 72 | Line 73 | getfont(                       /* return font fname */
73                          err = "bad # vertices for";
74                          goto fonterr;
75                  }
76 +                if (ngv > f->maxgv)
77 +                        f->maxgv = ngv;
78                  g = galloc(ngv);
79                  if (g == NULL)
80                          goto memerr;
# Line 113 | Line 116 | getfont(                       /* return font fname */
116          f->next = fontlist;
117          return(fontlist = f);
118   nonint:
119 <        sprintf(errmsg, "non-integer in font file \"%s\"\n", pathname);
120 <        eputs(errmsg);
119 >        sprintf(embuf, "non-integer in font file \"%s\"\n", pathname);
120 >        eputs(embuf);
121          fclose(fp);
122          return(NULL);
123   fonterr:
124 <        sprintf(errmsg, "%s character (%d) in font file \"%s\"\n",
124 >        sprintf(embuf, "%s character (%d) in font file \"%s\"\n",
125                          err, gn, pathname);
126 <        eputs(errmsg);
126 >        eputs(embuf);
127          fclose(fp);
128          return(NULL);
129   memerr:
# Line 139 | Line 142 | freefont(                      /* release a font (free all if NULL) */
142          FONT  *fl, *f;
143          int  i;
144                                          /* check reference count */
145 <        if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts))
145 >        if (fnt != NULL && ((fnt->nref -= (f->nref > 0)) | retainfonts))
146                  return;
147          head.next = fontlist;
148          fl = &head;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines