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

Comparing ray/src/rt/data.c (file contents):
Revision 2.23 by schorsch, Mon Jul 21 22:30:19 2003 UTC vs.
Revision 2.24 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 78 | Line 78 | char  *dname;
78                                                          /* get dimensions */
79          if (fgetval(fp, 'i', (char *)&asize) <= 0)
80                  goto scanerr;
81 <        if (asize <= 0 | asize > MAXDDIM) {
81 >        if ((asize <= 0) | (asize > MAXDDIM)) {
82                  sprintf(errmsg, "bad number of dimensions for \"%s\"", dname);
83                  error(USER, errmsg);
84          }
# Line 267 | Line 267 | DATARRAY  *dta;
267                  head.next = dtab[hval];
268                  dpl = &head;
269                  while ((dp = dpl->next) != NULL)
270 <                        if ((dta == NULL | dta == dp)) {
270 >                        if ((dta == NULL) | (dta == dp)) {
271                                  dpl->next = dp->next;
272                                  if (dp->type == DATATY)
273                                          free((void *)dp->arr.d);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines