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

Comparing ray/src/common/caldefn.c (file contents):
Revision 2.19 by schorsch, Mon Jul 21 22:30:17 2003 UTC vs.
Revision 2.21 by schorsch, Mon Oct 27 10:19:31 2003 UTC

# Line 32 | Line 32 | static const char      RCSid[] = "$Id$";
32   #include  <ctype.h>
33  
34   #include  "rterror.h"
35 + #include  "rtmisc.h"
36   #include  "calcomp.h"
37  
38   #ifndef  NHASH
# Line 259 | Line 260 | popcontext(void)                       /* pop off top context */
260      while (*++cp2 && *cp2 != CNTXMARK)
261          ;
262      cp1 = context;                      /* copy tail to front */
263 <    while (*cp1++ = *cp2++)
263 >    while ( (*cp1++ = *cp2++) )
264          ;
265      return(context);
266   }
# Line 707 | Line 708 | dvalue(char  *name, EPNODE     *d)
708      if (eclock >= MAXCLOCK)
709          eclock = 1;                             /* wrap clock counter */
710      if (ep2->v.tick < MAXCLOCK &&
711 <                ep2->v.tick == 0 | ep2->v.tick != eclock) {
711 >                (ep2->v.tick == 0) | (ep2->v.tick != eclock)) {
712          ep2->v.tick = d->type == ':' ? MAXCLOCK : eclock;
713          ep2 = ep2->sibling;
714          ep2->v.num = evalue(ep1);               /* needs new value */

Diff Legend

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