ViewVC Help

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

root/Development/ray/src/px/pcompos.c

Comparing ray/src/px/pcompos.c (file contents):
Revision 1.9 by greg, Fri May 31 10:21:31 1991 UTC vs.
Revision 2.1 by greg, Tue Nov 12 16:04:44 1991 UTC

#	Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14
15		#include  "color.h"
16
17	+	#include  "resolu.h"
18
19		#define  MAXFILE        32
20
#	Line 181 | Line 182 | getfile:
182		}
183		/* get picture size */
184		if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
185	<	input[nfile].fp) != (YMAJOR|YDECR)) {
185	>	input[nfile].fp) < 0) {
186		fprintf(stderr, "%s: bad picture size\n",
187		input[nfile].name);
188		quit(1);
#	Line 229 | Line 230 | getfile:
230		/* add new header info. */
231		printargs(argc, argv, stdout);
232		fputformat(COLRFMT, stdout);
233	<	printf("\n-Y %d +X %d\n", ysiz, xsiz);
233	>	putchar('\n');
234	>	fprtresolu(xsiz, ysiz, stdout);
235
236		compos();
237
#	Line 338 | Line 340 | int  *xp, *yp;
340		return(NULL);
341		if (checkheader(fp, COLRFMT, NULL) < 0)
342		goto err;
343	<	if (fgetresolu(xp, yp, fp) != (YMAJOR|YDECR))
343	>	if (fgetresolu(xp, yp, fp) < 0)
344		goto err;
345		return(fp);
346		err:

Diff Legend

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