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

Comparing ray/src/util/rcrop.c (file contents):
Revision 1.15 by greg, Thu May 16 18:59:19 2024 UTC vs.
Revision 1.16 by greg, Fri May 17 20:50:57 2024 UTC

# Line 269 | Line 269 | main(int argc, char *argv[])
269          cmin = atoi(argv[2]);
270          nrows = atoi(argv[3]);
271          ncols = atoi(argv[4]);
272 <        if ((rmin < 0) | (cmin < 0) | (nrows < 0) | (ncols < 0))
272 >        if ((rmin < 0) | (cmin < 0))
273                  goto usage;
274          if (argc <= 5)
275                  SET_FILE_BINARY(fp);
# Line 301 | Line 301 | main(int argc, char *argv[])
301                  fputs(": missing input dimensions\n", stderr);
302                  return(1);
303          }
304 <        if (!nrows)
305 <                nrows = numscans(&res) - rmin;
306 <        if (!ncols)
307 <                ncols = scanlen(&res) - cmin;
304 >        if (nrows <= 0 )
305 >                nrows += numscans(&res) - rmin;
306 >        if (ncols <= 0)
307 >                ncols += scanlen(&res) - cmin;
308          if ((nrows <= 0) | (ncols <= 0) |
309                          (rmin+nrows > numscans(&res)) |
310                          (cmin+ncols > scanlen(&res))) {

Diff Legend

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