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 2.27 by schorsch, Fri Jan 2 12:47:01 2004 UTC vs.
Revision 2.28 by greg, Mon Mar 15 21:16:54 2004 UTC

#	Line 39 | Line 39 | int  labelht = 24;                     /* label height */
39
40		int  checkthresh = 0;                   /* check threshold value */
41
42	+	char  StandardInput[] = "<stdin>";
43		char  Command[] = "<Command>";
44		char  Label[] = "<Label>";
45
#	Line 207 | Line 208 | getfile:
208		if (autolabel && thislabel == NULL)
209		thislabel = argv[an];
210		if (!strcmp(argv[an], "-")) {
211	<	input[nfile].name = "<stdin>";
211	>	input[nfile].name = StandardInput;
212		input[nfile].fp = stdin;
213		} else {
214		if (argv[an][0] == '!') {
#	Line 372 | Line 373 | compos()                               /* composite pictures */
373		quit(1);
374		}
375		}
376	+	/* read remainders from streams */
377	+	for (i = 0; i < nfile; i++)
378	+	if (input[i].name[0] == '<')
379	+	while (getc(input[i].fp) != EOF)
380	+	;
381		return;
382		memerr:
383		perror(progname);

Diff Legend

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