[ViewVC] Diff of: radiance/ray/src/px/x11image.c

Comparing ray/src/px/x11image.c (file contents):
Revision 2.51 by gwlarson, Mon Feb 9 14:37:09 1998 UTC vs.
Revision 2.54 by gwlarson, Wed Jun 16 08:15:17 1999 UTC

#	Line 29 \| Line 29 \| static char SCCSid[] = "$SunId$ SGI";
29
30		#undef NOPROTO
31		#define NOPROTO 1
32	+	#include "color.h"
33		#include "tonemap.h"
34		#include "view.h"
35		#include "x11raster.h"
36		#include "random.h"
37		#include "resolu.h"
38
38	–	#ifndef int4
39	–	#define int4 int /* most int's are 32-bit */
40	–	#endif
41	–
39		#define FONTNAME "8x13" /* text font we'll use */
40
41		#define CTRL(c) ((c)-'@')
#	Line 94 \| Line 91 \| *RESOLU inpres; / input resolution and ordering /*
91		int xmax, ymax; /* picture dimensions */
92		int width, height; /* window size */
93		char fname = NULL; / input file name */
94	<	FILE fin = stdin; / input file */
94	>	FILE fin = NULL; / input file */
95		long scanpos = NULL; / scan line positions in file */
96		int cury = 0; /* current scan location */
97
#	Line 146 \| Line 143 \| *char argv[];**
143		int pid;
144
145		progname = argv[0];
146	+	fin = stdin;
147
148		for (i = 1; i < argc; i++)
149		if (argv[i][0] == '-')
#	Line 253 \| Line 251 \| userr:
251		}
252
253
254	+	int
255		headline(s) /* get relevant info from header */
256		char *s;
257		{
#	Line 264 \| Line 263 \| *char s;**
263		wrongformat = strcmp(fmt, COLRFMT);
264		else if (isview(s) && sscanview(&ourview, s) > 0)
265		gotview++;
266	+	return(0);
267		}
268
269

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines