ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/text.c
(Generate patch)

Comparing ray/src/rt/text.c (file contents):
Revision 2.19 by gwlarson, Thu May 20 13:51:19 1999 UTC vs.
Revision 2.22 by greg, Tue May 13 17:58:33 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  text.c - functions for text patterns and mixtures.
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "ray.h"
11  
12   #include  "otypes.h"
# Line 77 | Line 76 | typedef struct {
76          TLINE  tl;                      /* line list */
77   }  TEXT;
78  
80 – extern char  *getlibpath();
81 –
82 – extern char  *fgetword();
83 –
79   TEXT  *gettext();
80  
81   TLINE  *tlalloc();
# Line 139 | Line 134 | TLINE *
134   tlalloc(s)                      /* allocate and assign text line */
135   char  *s;
136   {
142 –        extern char  *strcpy();
137          register int  siz;
138          register TLINE  *tl;
139  
# Line 159 | Line 153 | register OBJREC  *tm;
153   {
154   #define  R      (tm->oargs.farg+3)
155   #define  D      (tm->oargs.farg+6)
162 –        extern char  *strcpy();
156          FVECT  DxR;
157          double  d;
158          FILE  *fp;
# Line 203 | Line 196 | register OBJREC  *tm;
196                  tlp = tlp->next;
197          } else {                                /* text file */
198                  if ((s = getpath(tm->oargs.sarg[tndx(tm)],
199 <                                getlibpath(), R_OK)) == NULL) {
199 >                                getrlibpath(), R_OK)) == NULL) {
200                          sprintf(errmsg, "cannot find text file \"%s\"",
201                                          tm->oargs.sarg[tndx(tm)]);
202                          error(USER, errmsg);
# Line 258 | Line 251 | OBJREC  *m;
251                  return;
252          while ((tlp = tp->tl.next) != NULL) {
253                  tp->tl.next = tlp->next;
254 <                free((char *)tlp->spc);
255 <                free((char *)tlp);
254 >                free((void *)tlp->spc);
255 >                free((void *)tlp);
256          }
257 <        free((char *)tp);
257 >        freefont(tp->f);        /* release font reference */
258 >        free((void *)tp);
259          m->os = NULL;
260   }
261  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)