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.21 by greg, Fri Nov 19 21:56:48 2021 UTC vs.
Revision 2.24 by greg, Sat Nov 20 22:39:01 2021 UTC

# Line 16 | Line 16 | static const char      RCSid[] = "$Id$";
16  
17   #define galloc(nv)      (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
18  
19 –
19   int     retainfonts = 0;                /* retain loaded fonts? */
20  
21   static FONT     *fontlist = NULL;       /* list of loaded fonts */
# Line 27 | 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 42 | 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\"", fname);
46 <                error(SYSTEM, 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(embuf, "cannot open font file \"%s\"\n", pathname);
51 +                eputs(embuf);
52 +                return(NULL);
53 +        }
54          f = (FONT *)calloc(1, sizeof(FONT));
55          if (f == NULL)
56                  goto memerr;
57 <        f->name = savestr(fname);
57 >        strcpy(f->name, fname);
58          f->nref = 1;
53 –        if ((fp = fopen(pathname, "r")) == NULL) {
54 –                sprintf(errmsg, "cannot open font file \"%s\"",
55 –                                pathname);
56 –                error(SYSTEM, errmsg);
57 –        }
59          wsum = hsum = ngly = 0;                 /* get each glyph */
60          while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
61                  if (ngv == 0)
# Line 113 | Line 114 | getfont(                       /* return font fname */
114          f->next = fontlist;
115          return(fontlist = f);
116   nonint:
117 <        sprintf(errmsg, "non-integer in font file \"%s\"", pathname);
118 <        error(USER, errmsg);
117 >        sprintf(embuf, "non-integer in font file \"%s\"\n", pathname);
118 >        eputs(embuf);
119 >        fclose(fp);
120 >        return(NULL);
121   fonterr:
122 <        sprintf(errmsg, "%s character (%d) in font file \"%s\"",
122 >        sprintf(embuf, "%s character (%d) in font file \"%s\"\n",
123                          err, gn, pathname);
124 <        error(USER, errmsg);
124 >        eputs(embuf);
125 >        fclose(fp);
126 >        return(NULL);
127   memerr:
128 <        error(SYSTEM, "out of memory in fontglyph");
129 <        return NULL; /* pro forma return */
128 >        eputs("out of memory in getfont()\n");
129 >        fclose(fp);
130 >        return(NULL);
131   }
132  
133  
# Line 144 | Line 150 | freefont(                      /* release a font (free all if NULL) */
150                          for (i = 0; i < 256; i++)
151                                  if (f->fg[i] != NULL)
152                                          free((void *)f->fg[i]);
147 –                        freestr(f->name);
153                          free((void *)f);
154                  } else
155                          fl = f;

Diff Legend

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