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.25 by schorsch, Mon Oct 27 10:24:51 2003 UTC vs.
Revision 2.38 by greg, Fri Jul 19 17:37:56 2019 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*     6/30/87
8		*/
9
10	–	#include  <stdio.h>
10		#include  <math.h>
12	–	#include  <time.h>
13	–	#include  <string.h>
11
12		#include "copyright.h"
13
14	+	#include  "rtio.h"
15		#include  "platform.h"
16	<	#include  "rtprocess.h"
16	>	#include  "paths.h"
17	>	#include  "rterror.h"
18		#include  "color.h"
19		#include  "resolu.h"
20
21	<	#define  MAXFILE        64
21	>	#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
22	>	#undef getc
23	>	#define getc    getc_unlocked
24	>	#endif
25
26	+	#define  MAXFILE        1024
27	+
28		#define  HASMIN         1
29		#define  HASMAX         2
30
#	Line 39 | Line 43 | int  labelht = 24;                     /* label height */
43
44		int  checkthresh = 0;                   /* check threshold value */
45
46	+	char  StandardInput[] = "<stdin>";
47		char  Command[] = "<Command>";
48		char  Label[] = "<Label>";
49
#	Line 50 | Line 55 | struct {
55		int  xres, yres;                /* picture size */
56		int  xloc, yloc;                /* anchor point */
57		int  flags;                     /* HASMIN, HASMAX */
58	<	COLR  thmin, thmax;             /* thresholds */
58	>	double  thmin, thmax;           /* thresholds */
59		} input[MAXFILE];               /* our input files */
60
61		int  nfile;                     /* number of files */
62
63	+	int  echoheader = 1;
64		char  ourfmt[LPICFMT+1] = PICFMT;
65		int  wrongformat = 0;
66
61	–	FILE  *lblopen();
62	–	void  quit();
67
68	+	static gethfunc headline;
69	+	static void compos(void);
70	+	static int cmpcolr(COLR  c1, double lv2);
71	+	static FILE * lblopen(char  *s, int  *xp, int  *yp);
72
73	<	tabputs(s)                      /* print line preceded by a tab */
74	<	char  *s;
73	>
74	>
75	>	static int
76	>	headline(                       /* print line preceded by a tab */
77	>	char    *s,
78	>	void    *p
79	>	)
80		{
81	<	char  fmt[32];
81	>	char  fmt[MAXFMTLEN];
82
83		if (isheadid(s))
84		return(0);
#	Line 75 | Line 88 | char  *s;
88		strcpy(ourfmt, fmt);
89		} else
90		wrongformat = 1;
91	<	} else {
92	<	putc('\t', stdout);
91	>	} else if (echoheader) {
92	>	fputc('\t', stdout);
93		fputs(s, stdout);
94		}
95		return(0);
96		}
97
98
99	<	main(argc, argv)
100	<	int  argc;
101	<	char  *argv[];
99	>	int
100	>	main(
101	>	int  argc,
102	>	char  *argv[]
103	>	)
104		{
105		int  ncolumns = 0;
106		int  autolabel = 0;
#	Line 100 | Line 115 | char  *argv[];
115
116		for (an = 1; an < argc && argv[an][0] == '-'; an++)
117		switch (argv[an][1]) {
118	+	case 'h':
119	+	echoheader = !echoheader;
120	+	break;
121		case 'x':
122		xsiz = atoi(argv[++an]);
123		break;
#	Line 158 | Line 176 | dofiles:
176		checkthresh = 1;
177		if (argv[an][0] == '-') {
178		input[nfile].flags |= HASMIN;
179	<	setcolr(input[nfile].thmin,
162	<	atof(argv[an+1]),
163	<	atof(argv[an+1]),
164	<	atof(argv[an+1]));
179	>	input[nfile].thmin = atof(argv[an+1]);
180		} else if (argv[an][0] == '+') {
181		input[nfile].flags |= HASMAX;
182	<	setcolr(input[nfile].thmax,
168	<	atof(argv[an+1]),
169	<	atof(argv[an+1]),
170	<	atof(argv[an+1]));
182	>	input[nfile].thmax = atof(argv[an+1]);
183		} else
184		goto userr;
185		an++;
#	Line 202 | Line 214 | getfile:
214		if (autolabel && thislabel == NULL)
215		thislabel = argv[an];
216		if (!strcmp(argv[an], "-")) {
217	<	input[nfile].name = "<stdin>";
217	>	input[nfile].name = StandardInput;
218		input[nfile].fp = stdin;
219		} else {
220		if (argv[an][0] == '!') {
#	Line 219 | Line 231 | getfile:
231		}
232		an++;
233		/* get header */
234	<	printf("%s:\n", input[nfile].name);
235	<	getheader(input[nfile].fp, tabputs, NULL);
234	>	if (echoheader)
235	>	printf("%s:\n", input[nfile].name);
236	>	getheader(input[nfile].fp, headline, NULL);
237		if (wrongformat) {
238		fprintf(stderr, "%s: incompatible input format\n",
239		input[nfile].name);
#	Line 233 | Line 246 | getfile:
246		input[nfile].name);
247		quit(1);
248		}
249	<	if (ncolumns > 0) {
250	<	if (curcol >= ncolumns) {
249	>	if (ncolumns) {
250	>	if (curcol >= abs(ncolumns)) {
251		cury = ymax + spacing;
252		curx = x0;
253		curcol = 0;
#	Line 287 | Line 300 | getfile:
300		ysiz = ymax;
301		else if (ysiz > ymax)
302		ymax = ysiz;
303	+	if (ncolumns < 0) {             /* reverse rows if requested */
304	+	int     i = nfile;
305	+	while (i--)
306	+	input[i].yloc = ymax - input[i].yres - input[i].yloc;
307	+	}
308		/* add new header info. */
309		printargs(argc, argv, stdout);
310		if (strcmp(ourfmt, PICFMT))
#	Line 299 | Line 317 | getfile:
317		quit(0);
318		userr:
319		fprintf(stderr,
320	<	"Usage: %s [-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
320	>	"Usage: %s [-h][-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
321		progname);
322		fprintf(stderr, "[-t min1][+t max1][-l lab][=SS] pic1 x1 y1 ..\n");
323		quit(1);
#	Line 310 | Line 328 | toomany:
328		labelerr:
329		fprintf(stderr, "%s: error opening label\n", progname);
330		quit(1);
331	+	return 1; /* pro forma return */
332		}
333
334
335	<	compos()                                /* composite pictures */
335	>	static void
336	>	compos(void)                            /* composite pictures */
337		{
338		COLR  *scanin, *scanout;
339		int  y;
#	Line 367 | Line 387 | compos()                               /* composite pictures */
387		quit(1);
388		}
389		}
390	+	/* read remainders from streams */
391	+	for (i = 0; i < nfile; i++)
392	+	if (input[i].name[0] == '<')
393	+	while (getc(input[i].fp) != EOF)
394	+	;
395		return;
396		memerr:
397		perror(progname);
#	Line 374 | Line 399 | memerr:
399		}
400
401
402	<	int
403	<	cmpcolr(c1, c2)                 /* compare two colr's (improvisation) */
404	<	register COLR  c1, c2;
402	>	static int
403	>	cmpcolr(                        /* compare COLR to luminance */
404	>	register COLR  c1,
405	>	double lv2
406	>	)
407		{
408	<	register int  i, j;
409	<
410	<	j = 4;                          /* check exponents first! */
411	<	while (j--)
412	<	if ( (i = c1[j] - c2[j]) )
413	<	return(i);
408	>	double  lv1 = .0;
409	>
410	>	if (c1[EXP])
411	>	lv1 = ldexp((double)normbright(c1), (int)c1[EXP]-(COLXS+8));
412	>	if (lv1 < lv2) return(-1);
413	>	if (lv1 > lv2) return(1);
414		return(0);
415		}
416
417
418	<	FILE *
419	<	lblopen(s, xp, yp)              /* open pipe to label generator */
420	<	char  *s;
421	<	int  *xp, *yp;
418	>	static FILE *
419	>	lblopen(                /* open pipe to label generator */
420	>	char  *s,
421	>	int  *xp,
422	>	int  *yp
423	>	)
424		{
425	<	char  com[128];
425	>	char  com[PATH_MAX];
426		FILE  *fp;
427
428		sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);

Diff Legend

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