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

Comparing ray/src/rt/func.c (file contents):
Revision 2.2 by greg, Mon Nov 25 09:51:00 1991 UTC vs.
Revision 2.5 by greg, Wed Feb 5 09:23:38 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1991 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 80 | Line 80 | int  dofwd;
80          if (i == 1 && arg[ff][0] == '.')
81                  setcontext(f->ctx = "");        /* "." means no file */
82          else {
83 <                strcpy(sbuf,m->oargs.sarg[ff]); /* file name is context */
83 >                strcpy(sbuf,arg[ff]);   /* file name is context */
84                  if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
85                          sbuf[i-LCALSUF] = '\0'; /* remove suffix */
86                  setcontext(f->ctx = savestr(sbuf));
87                  if (!vardefined(REFVNAME)) {    /* file loaded? */
88 <                        loadfunc(m->oargs.sarg[ff]);
88 >                        loadfunc(arg[ff]);
89                          varset(REFVNAME, '=', 1.0);
90                  } else                          /* reference_count++ */
91                          varset(REFVNAME, '=', varvalue(REFVNAME)+1.0);
# Line 111 | Line 111 | int  dofwd;
111                  f->f = f->b = &unitxf;
112          else {                          /* get transform */
113                  if ((f->b = (XF *)malloc(sizeof(XF))) == NULL)
114 <                        goto memerr;;
114 >                        goto memerr;
115                  if (invxf(f->b, na-i, arg+i) != na-i)
116                          objerror(m, USER, "bad transform");
117                  if (f->b->sca < 0.0)
118                          f->b->sca = -f->b->sca;
119                  if (dofwd) {                    /* do both transforms */
120                          if ((f->f = (XF *)malloc(sizeof(XF))) == NULL)
121 <                                goto memerr;;
121 >                                goto memerr;
122                          xf(f->f, na-i, arg+i);
123                          if (f->f->sca < 0.0)
124                                  f->f->sca = -f->f->sca;
# Line 127 | Line 127 | int  dofwd;
127          m->os = (char *)f;
128          return(f);
129   toofew:
130 <        objerror(m, USER, "too few arguments");
130 >        objerror(m, USER, "too few string arguments");
131   memerr:
132          error(SYSTEM, "out of memory in getfunc");
133   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines