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

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.18 by greg, Fri Apr 16 12:03:59 1993 UTC vs.
Revision 2.22 by greg, Wed Aug 4 10:08:47 1993 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1993 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 82 | Line 82 | char  *argv[];
82          
83          progname = argv[0];
84          for (i = 1; i < argc; i++) {
85 +                                                /* expand arguments */
86 +                while (rval = expandarg(&argc, &argv, i))
87 +                        if (rval < 0) {
88 +                                fprintf(stderr, "%s: cannot expand '%s'",
89 +                                                argv[0], argv[i]);
90 +                                exit(1);
91 +                        }
92                  if (argv[i][0] == '-')
93                          switch (argv[i][1]) {
94                          case 'v':
# Line 241 | Line 248 | int
248   nextpiece(xp, yp)               /* get next piece assignment */
249   int  *xp, *yp;
250   {
244 –        extern char  *fgets();
251          struct flock  fls;
252          char  buf[64];
253  
# Line 336 | Line 342 | rpiece()                       /* render picture piece by piece */
342                  putc('\n', torp);
343                  fflush(torp);                   /* assigns piece to rpict */
344                  putpiece(xorg, yorg);           /* place piece in output */
339 –                if (verbose) {                  /* notify caller */
340 –                        printf("%d %d done\n", xorg, yorg);
341 –                        fflush(stdout);
342 –                }
345          }
346   }
347  
# Line 391 | Line 393 | int  xpos, ypos;
393   #else
394          pid = -1;               /* no forking */
395   #endif
396 <        fls.l_len = (long)vres*hmult*hres*sizeof(COLR);
397 <        fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len;
396 >        fls.l_start = scanorig +
397 >                ((long)(vmult-1-ypos)*vres*hmult+xpos)*hres*sizeof(COLR);
398   #if NFS
399 +        fls.l_len = ((long)(vres-1)*hmult+1)*hres*sizeof(COLR);
400                                  /* lock file section so NFS doesn't mess up */
401          fls.l_whence = 0;
402          fls.l_type = F_WRLCK;
403          fcntl(outfd, F_SETLKW, &fls);
404   #endif
405                                  /* write new piece to file */
406 <        if (lseek(outfd, fls.l_start+(long)xpos*hres*sizeof(COLR), 0) == -1)
406 >        if (lseek(outfd, fls.l_start, 0) == -1)
407                  goto seekerr;
408          if (hmult == 1) {
409                  if (writebuf(outfd, (char *)pbuf,
# Line 416 | Line 419 | int  xpos, ypos;
419                                          1) == -1)
420                                  goto seekerr;
421                  }
422 <        if (pid == -1) {        /* fork failed */
422 >        if (verbose) {                          /* notify caller */
423 >                printf("%d %d done\n", xpos, ypos);
424 >                fflush(stdout);
425 >        }
426 >        if (pid == -1) {        /* didn't fork or fork failed */
427   #if NFS
428                  fls.l_type = F_UNLCK;           /* release lock */
429                  fcntl(outfd, F_SETLKW, &fls);

Diff Legend

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