ViewVC Help

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

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

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.7 by greg, Mon Sep 21 12:13:48 1992 UTC vs.
Revision 2.9 by greg, Fri Apr 9 09:49:36 1993 UTC

#	Line 16 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
16		#include <fcntl.h>
17		#endif
18
19	+	#include <math.h>
20	+
21		#include <errno.h>
22
23		#include "color.h"
24
25	<	#include  "resolu.h"
25	>	#include "resolu.h"
26
27		#include "calcomp.h"
28
#	Line 207 | Line 209 | usage:
209		eputs("Usage: ");
210		eputs(argv[0]);
211		eputs(
212	<	" [-w][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n");
212	>	" [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n");
213		quit(1);
214		}
215
#	Line 347 | Line 349 | combine()                      /* combine pictures */
349
350		advance()                       /* read in data for next scanline */
351		{
350	–	extern double  fabs();
352		int     ytarget;
353		register COLOR  *st;
354		register int    i, j;

Diff Legend

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