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.14 by greg, Wed Dec 2 17:07:00 1992 UTC vs.
Revision 2.15 by greg, Thu Jan 21 17:46:31 1993 UTC

# Line 116 | Line 116 | char  *argv[];
116                                          exit(1);
117                                  }
118                                  continue;
119 +                        case 'z':               /* z-file ist verbotten */
120 +                                fprintf(stderr, "%s: -z option not allowed\n",
121 +                                                argv[0]);
122 +                                exit(1);
123                          case 'o':               /* output file */
124                                  if (argv[i][2])
125                                          break;
# Line 131 | Line 135 | char  *argv[];
135          }
136          init(argc, argv);
137          rpiece();
138 <        rval = cleanup(0);
135 <        exit(rval);
138 >        exit(cleanup(0));
139   }
140  
141  
# Line 173 | Line 176 | char  **av;
176                  if ((fp = fdopen(dup(outfd), "r+")) == NULL)
177                          goto filerr;
178                  getheader(fp, NULL, NULL);      /* skip header */
179 <                if (fscnresolu(&hr, &vr, fp) < 0 ||     /* check resolution */
179 >                if (!fscnresolu(&hr, &vr, fp) ||        /* check resolution */
180                                  hr != hres*hmult || vr != vres*vmult) {
181                          fprintf(stderr, "%s: resolution mismatch on file \"%s\"\n",
182                                          progname, outfile);
# Line 336 | Line 339 | int  xpos, ypos;
339          }
340                                  /* check header from rpict */
341          getheader(fromrp, NULL, NULL);
342 <        if (fscnresolu(&hr, &vr, fromrp) < 0 || hr != hres | vr != vres) {
342 >        if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
343                  fprintf(stderr, "%s: resolution mismatch from %s\n",
344                                  progname, rpargv[0]);
345                  exit(cleanup(1));
# Line 362 | Line 365 | int  xpos, ypos;
365   #else
366          pid = -1;               /* no forking */
367   #endif
368 +        fls.l_len = (long)vres*hmult*hres*sizeof(COLR);
369 +        fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len;
370   #if NFS
371                                  /* lock file section so NFS doesn't mess up */
372          fls.l_whence = 0;
368 –        fls.l_len = (long)vres*hmult*hres*sizeof(COLR);
369 –        fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len;
373          fls.l_type = F_WRLCK;
374          fcntl(outfd, F_SETLKW, &fls);
375   #endif

Diff Legend

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