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.1 by greg, Thu Feb 2 10:49:23 1989 UTC vs.
Revision 1.4 by greg, Tue Sep 12 13:04:24 1989 UTC

#	Line 132 | Line 132 | getfile:
132		printf("%s:\n", input[nfile].name);
133		getheader(input[nfile].fp, tabputs);
134		/* get picture size */
135	<	if (fscanf(input[nfile].fp, "-Y %d +X %d\n",
136	<	&input[nfile].yres, &input[nfile].xres) != 2) {
135	>	if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
136	>	input[nfile].fp) != (YMAJOR|YDECR)) {
137		fprintf(stderr, "%s: bad picture size\n",
138		input[nfile].name);
139		quit(1);
#	Line 173 | Line 173 | compos()                               /* composite pictures */
173		int  y;
174		register int  x, i;
175
176	<	scanin = (COLR *)malloc((xmax-xmin)*sizeof(COLR)) - xmin;
177	<	scanin = (COLR *)malloc((xmax-xmin)*sizeof(COLR)) - xmin;
176	>	scanin = (COLR *)malloc((xmax-xmin)*sizeof(COLR));
177		if (scanin == NULL)
178		goto memerr;
179		scanin -= xmin;
#	Line 193 | Line 192 | compos()                               /* composite pictures */
192		continue;
193		if (freadcolrs(scanin+input[i].xloc,
194		input[i].xres, input[i].fp) < 0) {
195	<	fprintf(stderr, "%s: read error\n",
196	<	input[i].name);
195	>	fprintf(stderr, "%s: read error (y==%d)\n",
196	>	input[i].name,
197	>	y-input[i].yloc);
198		quit(1);
199		}
200		if (y >= ysiz)

Diff Legend

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