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.16 by schorsch, Sun Jul 27 22:12:01 2003 UTC vs.
Revision 2.18 by schorsch, Fri Mar 26 21:29:19 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include "standard.h"
10 > #include <stdlib.h>
11  
12 + #include "rtio.h"
13 + #include "rterror.h"
14   #include "font.h"
15  
16   #define galloc(nv)      (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
# Line 24 | Line 26 | getfont(fname)                         /* return font fname */
26   char  *fname;
27   {
28          FILE  *fp;
29 <        char  *pathname, *err;
29 >        char  *pathname, *err = NULL;
30          unsigned  wsum, hsum, ngly;
31          int  gn, ngv, gv;
32          register GLYPH  *g;
# Line 208 | Line 210 | FONT  *f;                      /* font */
210   int  cis;                       /* target intercharacter spacing */
211   int  nsi;                       /* minimum number of spaces for indent */
212   {
213 <        register char  *end, *tab;
213 >        register char  *end, *tab = NULL;
214          GLYPH  *gp;
215          short  *nsp;
216          int  alen, len, width;

Diff Legend

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