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

Comparing ray/src/rt/source.c (file contents):
Revision 2.34 by greg, Tue Jun 24 15:37:01 2003 UTC vs.
Revision 2.35 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 115 | Line 115 | marksources()                  /* find and mark source objects */
115          maxcntr = nsources + MAXSPART;  /* start with this many */
116          srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
117          cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
118 <        if (srccnt == NULL | cntord == NULL)
118 >        if ((srccnt == NULL) | (cntord == NULL))
119                  goto memerr;
120          return;
121   memerr:
# Line 297 | Line 297 | char  *p;                      /* data for f */
297                                          maxcntr*sizeof(CONTRIB));
298                          cntord = (CNTPTR *)realloc((void *)cntord,
299                                          maxcntr*sizeof(CNTPTR));
300 <                        if (srccnt == NULL | cntord == NULL)
300 >                        if ((srccnt == NULL) | (cntord == NULL))
301                                  error(SYSTEM, "out of memory in direct");
302                  }
303                  cntord[sn].sndx = sn;
# Line 493 | Line 493 | register RAY  *r;
493  
494   static int weaksrcmod(obj) int obj;     /* efficiency booster function */
495   {register OBJREC *o = objptr(obj);
496 < return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
496 > return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));}
497  
498   #define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
499                                  r->rod > 0.0 && \

Diff Legend

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