ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rcrop.c

Comparing ray/src/util/rcrop.c (file contents):
Revision 1.3 by greg, Tue Mar 15 01:44:27 2022 UTC vs.
Revision 1.4 by greg, Tue Mar 15 02:28:05 2022 UTC

#	Line 79 | Line 79 | colr_copyf(FILE *fp)
79		return(1);
80		writerr:
81		fputs(progname, stderr);
82	<	fputs(": error writing scanline\n", stderr);
82	>	fputs(": error writing picture\n", stderr);
83		return(0);
84		readerr:
85		fputs(progname, stderr);
86	<	fputs(": error reading scanline\n", stderr);
86	>	fputs(": error reading picture\n", stderr);
87		return(0);
88		}
89
#	Line 258 | Line 258 | main(int argc, char *argv[])
258		return(1);
259		}
260		printargs(argc, argv, stdout);
261	<	if (gotvw) {
261	>	if (gotvw) {            /* adjust view? */
262		double          p0[2], p1[2];
263		const char      *err;
264		if (res.rt & YMAJOR) {
#	Line 287 | Line 287 | main(int argc, char *argv[])
287		fputs(err, stderr);
288		fputc('\n', stderr);
289		return(1);
290	+	} else {
291	+	fputs(VIEWSTR, stdout);
292	+	fprintview(&vw, stdout);
293	+	fputc('\n', stdout);
294		}
291	–	fputs(VIEWSTR, stdout);
292	–	fprintview(&vw, stdout);
293	–	fputc('\n', stdout);
295		}
296		if (gotdims)
297		printf("NROWS=%d\nNCOLS=%d\n", nrows, ncols);
#	Line 318 | Line 319 | main(int argc, char *argv[])
319		} else if (globmatch(PICFMT, fmt)) {
320		asiz = -1;
321		if (!ncomp) ncomp = 3;
322	+	else ncomp *= (ncomp == 3);
323		} else if (strcasecmp(fmt, "ascii")) {
324		fputs(progname, stderr);
325		fputs(": unsupported format - ", stderr);

Diff Legend

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