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.23 by greg, Sat Nov 20 15:53:24 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 42 | Line 41 | getfont(                       /* return font fname */
41                  }
42                                                  /* load the font file */
43          if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
44 <                sprintf(errmsg, "cannot find font file \"%s\"", fname);
45 <                error(SYSTEM, errmsg);
44 >                sprintf(errmsg, "cannot find font file \"%s\"\n", fname);
45 >                eputs(errmsg);
46 >                return(NULL);
47          }
48 +        if ((fp = fopen(pathname, "r")) == NULL) {
49 +                sprintf(errmsg, "cannot open font file \"%s\"\n", pathname);
50 +                eputs(errmsg);
51 +                return(NULL);
52 +        }
53          f = (FONT *)calloc(1, sizeof(FONT));
54          if (f == NULL)
55                  goto memerr;
56 <        f->name = savestr(fname);
56 >        strcpy(f->name, fname);
57          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 –        }
58          wsum = hsum = ngly = 0;                 /* get each glyph */
59          while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
60                  if (ngv == 0)
# Line 113 | Line 113 | getfont(                       /* return font fname */
113          f->next = fontlist;
114          return(fontlist = f);
115   nonint:
116 <        sprintf(errmsg, "non-integer in font file \"%s\"", pathname);
117 <        error(USER, errmsg);
116 >        sprintf(errmsg, "non-integer in font file \"%s\"\n", pathname);
117 >        eputs(errmsg);
118 >        fclose(fp);
119 >        return(NULL);
120   fonterr:
121 <        sprintf(errmsg, "%s character (%d) in font file \"%s\"",
121 >        sprintf(errmsg, "%s character (%d) in font file \"%s\"\n",
122                          err, gn, pathname);
123 <        error(USER, errmsg);
123 >        eputs(errmsg);
124 >        fclose(fp);
125 >        return(NULL);
126   memerr:
127 <        error(SYSTEM, "out of memory in fontglyph");
128 <        return NULL; /* pro forma return */
127 >        eputs("out of memory in getfont()\n");
128 >        fclose(fp);
129 >        return(NULL);
130   }
131  
132  
# Line 144 | Line 149 | freefont(                      /* release a font (free all if NULL) */
149                          for (i = 0; i < 256; i++)
150                                  if (f->fg[i] != NULL)
151                                          free((void *)f->fg[i]);
147 –                        freestr(f->name);
152                          free((void *)f);
153                  } else
154                          fl = f;

Diff Legend

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