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.8 by greg, Thu May 30 10:33:30 1991 UTC vs.
Revision 2.9 by greg, Mon Aug 10 11:23:13 1992 UTC

#	Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14
15		#include  "color.h"
16
17	+	#include  "resolu.h"
18
19	<	#define  MAXFILE        32
19	>	#define  MAXFILE        64
20
20	–	#define  SIGNHT         24
21	–	#define  setpscom(b,n)  sprintf(b, "psign -h %d '%.30s'|pfilt -1 -x /2 -y /2",\
22	–	2*SIGNHT, n)
23	–
21		/* output picture size */
22		int  xsiz = 0;
23		int  ysiz = 0;
#	Line 32 | Line 29 | int  ymax = 0;
29
30		COLR  bgcolr = BLKCOLR;                 /* background color */
31
32	+	int  labelht = 24;                      /* label height */
33	+
34		int  checkthresh = 0;                   /* check threshold value */
35
36		char  *progname;
#	Line 49 | Line 48 | int  nfile;                    /* number of files */
48
49		int  wrongformat = 0;
50
51	<	char  tmpbuf[128];
51	>	FILE  *popen(), *lblopen();
52
54	–	FILE  *popen();
53
56	–
54		tabputs(s)                      /* print line preceded by a tab */
55		char  *s;
56		{
#	Line 73 | Line 70 | main(argc, argv)
70		int  argc;
71		char  *argv[];
72		{
76	–	double  atof();
73		int  ncolumns = 0;
74	<	int  dolabels = 0;
74	>	int  autolabel = 0;
75		int  curcol = 0, curx = 0, cury = 0;
76	+	char  *thislabel;
77		int  an;
78
79		progname = argv[0];
#	Line 99 | Line 96 | char  *argv[];
96		ncolumns = atoi(argv[++an]);
97		break;
98		case 'l':
99	<	dolabels++;
99	>	switch (argv[an][2]) {
100	>	case 'a':
101	>	autolabel++;
102	>	break;
103	>	case 'h':
104	>	labelht = atoi(argv[++an]);
105	>	break;
106	>	case '\0':
107	>	goto dofiles;
108	>	default:
109	>	goto userr;
110	>	}
111		break;
112		case '\0':
113		case 't':
#	Line 109 | Line 117 | char  *argv[];
117		}
118		dofiles:
119		for (nfile = 0; an < argc; nfile++) {
120	<	if (dolabels) {
121	<	if (nfile >= MAXFILE-1) {
122	<	fprintf(stderr,
115	<	"%s: only %d files allowed with labels\n",
116	<	progname, MAXFILE/2);
117	<	quit(1);
118	<	}
119	<	} else {
120	<	if (nfile >= MAXFILE) {
121	<	fprintf(stderr, "%s: only %d files allowed\n",
122	<	progname, MAXFILE);
123	<	quit(1);
124	<	}
125	<	}
120	>	if (nfile >= MAXFILE)
121	>	goto toomany;
122	>	thislabel = NULL;
123		input[nfile].hasmin = input[nfile].hasmax = 0;
124		while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'))
125		switch (argv[an][1]) {
#	Line 143 | Line 140 | dofiles:
140		}
141		an += 2;
142		break;
143	+	case 'l':
144	+	if (strcmp(argv[an], "-l"))
145	+	goto userr;
146	+	thislabel = argv[an+1];
147	+	an += 2;
148	+	break;
149		case '\0':
150		if (argv[an][0] == '-')
151		goto getfile;
152	<	/* fall through */
152	>	goto userr;
153		default:
154		goto userr;
155		}
156		getfile:
157		if (argc-an < (ncolumns ? 1 : 3))
158		goto userr;
159	+	if (autolabel && thislabel == NULL)
160	+	thislabel = argv[an];
161		if (!strcmp(argv[an], "-")) {
162		input[nfile].name = "<stdin>";
163		input[nfile].fp = stdin;
164		} else {
165	<	input[nfile].name = argv[an];
166	<	if ((input[nfile].fp = argv[an][0] == '!' ?
167	<	popen(argv[an]+1, "r") :
168	<	fopen(argv[an], "r")) == NULL) {
165	>	if (argv[an][0] == '!') {
166	>	input[nfile].name = "<Command>";
167	>	input[nfile].fp = popen(argv[an]+1, "r");
168	>	} else {
169	>	input[nfile].name = argv[an];
170	>	input[nfile].fp = fopen(argv[an], "r");
171	>	}
172	>	if (input[nfile].fp == NULL) {
173		perror(argv[an]);
174		quit(1);
175		}
#	Line 176 | Line 185 | getfile:
185		}
186		/* get picture size */
187		if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
188	<	input[nfile].fp) != (YMAJOR|YDECR)) {
188	>	input[nfile].fp) < 0) {
189		fprintf(stderr, "%s: bad picture size\n",
190		input[nfile].name);
191		quit(1);
#	Line 203 | Line 212 | getfile:
212		xmax = input[nfile].xloc+input[nfile].xres;
213		if (input[nfile].yloc+input[nfile].yres > ymax)
214		ymax = input[nfile].yloc+input[nfile].yres;
215	<	if (dolabels) {
216	<	input[++nfile].name = "<Label>";
217	<	setpscom(tmpbuf, input[nfile-1].name);
218	<	if ((input[nfile].fp = popen(tmpbuf, "r")) == NULL)
215	>	if (thislabel != NULL) {
216	>	if (++nfile >= MAXFILE)
217	>	goto toomany;
218	>	input[nfile].name = "<Label>";
219	>	input[nfile].hasmin = input[nfile].hasmax = 0;
220	>	input[nfile].xres = input[nfile-1].xres;
221	>	input[nfile].yres = labelht;
222	>	if ((input[nfile].fp = lblopen(thislabel,
223	>	&input[nfile].xres,
224	>	&input[nfile].yres)) == NULL)
225		goto labelerr;
211	–	if (checkheader(input[nfile].fp, COLRFMT, NULL) < 0)
212	–	goto labelerr;
213	–	if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
214	–	input[nfile].fp) != (YMAJOR|YDECR))
215	–	goto labelerr;
226		input[nfile].xloc = input[nfile-1].xloc;
227		input[nfile].yloc = input[nfile-1].yloc +
228	<	input[nfile-1].yres - SIGNHT;
219	<	input[nfile].hasmin = input[nfile].hasmax = 0;
228	>	input[nfile-1].yres-input[nfile].yres;
229		}
230		}
231		if (xsiz <= 0)
#	Line 226 | Line 235 | getfile:
235		/* add new header info. */
236		printargs(argc, argv, stdout);
237		fputformat(COLRFMT, stdout);
238	<	printf("\n-Y %d +X %d\n", ysiz, xsiz);
238	>	putchar('\n');
239	>	fprtresolu(xsiz, ysiz, stdout);
240
241		compos();
242
243		quit(0);
244		userr:
245	<	fprintf(stderr, "Usage: %s [-x xr][-y yr][-b r g b][-a n][-l] ",
245	>	fprintf(stderr, "Usage: %s [-x xr][-y yr][-b r g b][-a n][-la][-lh h] ",
246		progname);
247	<	fprintf(stderr, "[-t min1][+t max1] pic1 x1 y1 ..\n");
247	>	fprintf(stderr, "[-t min1][+t max1][-l lab] pic1 x1 y1 ..\n");
248		quit(1);
249	+	toomany:
250	+	fprintf(stderr, "%s: only %d files and labels allowed\n",
251	+	progname, MAXFILE);
252	+	quit(1);
253		labelerr:
254		fprintf(stderr, "%s: error opening label\n", progname);
255		quit(1);
#	Line 317 | Line 331 | register COLR  c1, c2;
331		}
332
333
334	+	FILE *
335	+	lblopen(s, xp, yp)              /* open pipe to label generator */
336	+	char  *s;
337	+	int  *xp, *yp;
338	+	{
339	+	char  com[128];
340	+	FILE  *fp;
341	+
342	+	sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);
343	+	if ((fp = popen(com, "r")) == NULL)
344	+	return(NULL);
345	+	if (checkheader(fp, COLRFMT, NULL) < 0)
346	+	goto err;
347	+	if (fgetresolu(xp, yp, fp) < 0)
348	+	goto err;
349	+	return(fp);
350	+	err:
351	+	pclose(fp);
352	+	return(NULL);
353	+	}
354	+
355	+
356		quit(code)              /* exit gracefully */
357		int  code;
358		{
359	+	int  status;
360	+
361	+	if (code == 0)                  /* reap any children */
362	+	while (wait(&status) != -1)
363	+	if (code == 0)
364	+	code = status>>8 & 0xff;
365		exit(code);
366		}

Diff Legend

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