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.30 by greg, Wed May 25 04:44:26 2005 UTC vs.
Revision 2.37 by greg, Thu Aug 2 18:33:43 2018 UTC

#	Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15		#include "copyright.h"
16
17		#include  "platform.h"
18	<	#include  "rtprocess.h"
18	>	#include  "paths.h"
19		#include  "rterror.h"
20		#include  "color.h"
21		#include  "resolu.h"
22
23	<	#define  MAXFILE        512
23	>	#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
24	>	#undef getc
25	>	#define getc    getc_unlocked
26	>	#endif
27
28	+	#define  MAXFILE        1024
29	+
30		#define  HASMIN         1
31		#define  HASMAX         2
32
#	Line 52 | Line 57 | struct {
57		int  xres, yres;                /* picture size */
58		int  xloc, yloc;                /* anchor point */
59		int  flags;                     /* HASMIN, HASMAX */
60	<	COLR  thmin, thmax;             /* thresholds */
60	>	double  thmin, thmax;           /* thresholds */
61		} input[MAXFILE];               /* our input files */
62
63		int  nfile;                     /* number of files */
64
65	+	int  echoheader = 1;
66		char  ourfmt[LPICFMT+1] = PICFMT;
67		int  wrongformat = 0;
68
69
70	<	static gethfunc tabputs;
70	>	static gethfunc headline;
71		static void compos(void);
72	<	static int cmpcolr(COLR  c1, COLR  c2);
72	>	static int cmpcolr(COLR  c1, double lv2);
73		static FILE * lblopen(char  *s, int  *xp, int  *yp);
74
75
76
77		static int
78	<	tabputs(                        /* print line preceded by a tab */
78	>	headline(                       /* print line preceded by a tab */
79		char    *s,
80		void    *p
81		)
82		{
83	<	char  fmt[32];
83	>	char  fmt[MAXFMTLEN];
84
85		if (isheadid(s))
86		return(0);
#	Line 84 | Line 90 | tabputs(                       /* print line preceded by a tab */
90		strcpy(ourfmt, fmt);
91		} else
92		wrongformat = 1;
93	<	} else {
94	<	putc('\t', stdout);
93	>	} else if (echoheader) {
94	>	fputc('\t', stdout);
95		fputs(s, stdout);
96		}
97		return(0);
#	Line 111 | Line 117 | main(
117
118		for (an = 1; an < argc && argv[an][0] == '-'; an++)
119		switch (argv[an][1]) {
120	+	case 'h':
121	+	echoheader = !echoheader;
122	+	break;
123		case 'x':
124		xsiz = atoi(argv[++an]);
125		break;
#	Line 169 | Line 178 | dofiles:
178		checkthresh = 1;
179		if (argv[an][0] == '-') {
180		input[nfile].flags |= HASMIN;
181	<	setcolr(input[nfile].thmin,
173	<	atof(argv[an+1]),
174	<	atof(argv[an+1]),
175	<	atof(argv[an+1]));
181	>	input[nfile].thmin = atof(argv[an+1]);
182		} else if (argv[an][0] == '+') {
183		input[nfile].flags |= HASMAX;
184	<	setcolr(input[nfile].thmax,
179	<	atof(argv[an+1]),
180	<	atof(argv[an+1]),
181	<	atof(argv[an+1]));
184	>	input[nfile].thmax = atof(argv[an+1]);
185		} else
186		goto userr;
187		an++;
#	Line 230 | Line 233 | getfile:
233		}
234		an++;
235		/* get header */
236	<	printf("%s:\n", input[nfile].name);
237	<	getheader(input[nfile].fp, tabputs, NULL);
236	>	if (echoheader)
237	>	printf("%s:\n", input[nfile].name);
238	>	getheader(input[nfile].fp, headline, NULL);
239		if (wrongformat) {
240		fprintf(stderr, "%s: incompatible input format\n",
241		input[nfile].name);
#	Line 244 | Line 248 | getfile:
248		input[nfile].name);
249		quit(1);
250		}
251	<	if (ncolumns > 0) {
252	<	if (curcol >= ncolumns) {
251	>	if (ncolumns) {
252	>	if (curcol >= abs(ncolumns)) {
253		cury = ymax + spacing;
254		curx = x0;
255		curcol = 0;
#	Line 298 | Line 302 | getfile:
302		ysiz = ymax;
303		else if (ysiz > ymax)
304		ymax = ysiz;
305	+	if (ncolumns < 0) {             /* reverse rows if requested */
306	+	int     i = nfile;
307	+	while (i--)
308	+	input[i].yloc = ymax - input[i].yres - input[i].yloc;
309	+	}
310		/* add new header info. */
311		printargs(argc, argv, stdout);
312		if (strcmp(ourfmt, PICFMT))
#	Line 310 | Line 319 | getfile:
319		quit(0);
320		userr:
321		fprintf(stderr,
322	<	"Usage: %s [-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
322	>	"Usage: %s [-h][-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
323		progname);
324		fprintf(stderr, "[-t min1][+t max1][-l lab][=SS] pic1 x1 y1 ..\n");
325		quit(1);
#	Line 393 | Line 402 | memerr:
402
403
404		static int
405	<	cmpcolr(                        /* compare two colr's (improvisation) */
405	>	cmpcolr(                        /* compare COLR to luminance */
406		register COLR  c1,
407	<	register COLR  c2
407	>	double lv2
408		)
409		{
410	<	register int  i, j;
411	<
412	<	j = 4;                          /* check exponents first! */
413	<	while (j--)
414	<	if ( (i = c1[j] - c2[j]) )
415	<	return(i);
410	>	double  lv1 = .0;
411	>
412	>	if (c1[EXP])
413	>	lv1 = ldexp((double)normbright(c1), (int)c1[EXP]-(COLXS+8));
414	>	if (lv1 < lv2) return(-1);
415	>	if (lv1 > lv2) return(1);
416		return(0);
417		}
418

Diff Legend

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