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.42 by greg, Mon Oct 20 16:01:55 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Generate sections of a picture.
6   */
7  
8 + #include "platform.h"
9   #include "standard.h"
10  
11   #ifndef F_SETLKW
# Line 452 | Line 453 | int  xpos, ypos;
453          int  hr, vr;
454          register int  y;
455                                  /* check bounds */
456 <        if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) {
456 >        if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
457                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
458                                  progname, xpos, ypos);
459                  exit(cleanup(1));
# Line 460 | Line 461 | int  xpos, ypos;
461                                  /* check header from rpict */
462          guard_io();
463          getheader(fromrp, NULL, NULL);
464 <        if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
464 >        if (!fscnresolu(&hr, &vr, fromrp) || (hr != hres) | (vr != vres)) {
465                  fprintf(stderr, "%s: resolution mismatch from %s\n",
466                                  progname, rpargv[0]);
467                  exit(cleanup(1));
# Line 505 | Line 506 | int  xpos, ypos;
506                  filerr("lock");
507   #endif
508                                  /* write new piece to file */
509 <        if (lseek(outfd, (off_t)fls.l_start, 0) < 0)
509 >        if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
510                  filerr("seek");
511          if (hmult == 1) {
512                  if (writebuf(outfd, (char *)pbuf,
# Line 518 | Line 519 | int  xpos, ypos;
519                                  filerr("write");
520                          if (y < vr-1 && lseek(outfd,
521                                          (off_t)(hmult-1)*hr*sizeof(COLR),
522 <                                        1) < 0)
522 >                                        SEEK_CUR) < 0)
523                                  filerr("seek");
524                  }
525   #if NFS

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines