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

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.40 by schorsch, Mon Jul 21 22:30:19 2003 UTC vs.
Revision 2.41 by schorsch, Sun Jul 27 22:12:04 2003 UTC

# Line 452 | Line 452 | int  xpos, ypos;
452          int  hr, vr;
453          register int  y;
454                                  /* check bounds */
455 <        if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) {
455 >        if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
456                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
457                                  progname, xpos, ypos);
458                  exit(cleanup(1));
# Line 460 | Line 460 | int  xpos, ypos;
460                                  /* check header from rpict */
461          guard_io();
462          getheader(fromrp, NULL, NULL);
463 <        if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
463 >        if (!fscnresolu(&hr, &vr, fromrp) || (hr != hres) | (vr != vres)) {
464                  fprintf(stderr, "%s: resolution mismatch from %s\n",
465                                  progname, rpargv[0]);
466                  exit(cleanup(1));

Diff Legend

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