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.47 by greg, Fri Jan 12 00:50:17 2018 UTC vs.
Revision 2.53 by greg, Fri Mar 18 18:31:47 2022 UTC

#	Line 31 | Line 31 | struct {
31
32		int     nfiles;                         /* number of input files */
33
34	+	VIEW    *commvp = NULL;                 /* common view parameters */
35	+
36		char    ourfmt[LPICFMT+1] = PICFMT;     /* input picture format */
37
38		char    StandardInput[] = "<stdin>";
#	Line 74 | Line 76 | int    gotview;
76
77
78		static gethfunc headline;
79	<	static void checkfile(void);
79	>	static void checkfile(int orig);
80		static double rgb_bright(COLOR  clr);
81		static double xyz_bright(COLOR  clr);
82		static void init(void);
#	Line 175 | Line 177 | main(
177		quit(1);
178		}
179		}
180	<	checkfile();
179	<	if (original) {
180	<	colval(input[nfiles].coef,RED) /=
181	<	colval(input[nfiles].expos,RED);
182	<	colval(input[nfiles].coef,GRN) /=
183	<	colval(input[nfiles].expos,GRN);
184	<	colval(input[nfiles].coef,BLU) /=
185	<	colval(input[nfiles].expos,BLU);
186	<	setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
187	<	}
180	>	checkfile(original);
181		nfiles++;
182		original = 0;
183		}
184		init();                         /* set constants */
185		/* go back and get expressions */
186		for (a = 1; a < argc; a++) {
187	+	char    *fpath;
188		if (argv[a][0] == '-')
189		switch (argv[a][1]) {
190		case 'x':
#	Line 204 | Line 198 | main(
198		case 'h':
199		continue;
200		case 'f':
201	<	fcompile(argv[++a]);
201	>	fpath = getpath(argv[++a], getrlibpath(), 0);
202	>	if (fpath == NULL) {
203	>	eputs(argv[0]);
204	>	eputs(": cannot find file '");
205	>	eputs(argv[a]);
206	>	eputs("'\n");
207	>	quit(1);
208	>	}
209	>	fcompile(fpath);
210		continue;
211		case 'e':
212		scompile(argv[++a], NULL, 0);
#	Line 212 | Line 214 | main(
214		}
215		break;
216		}
217	<	/* set/get output resolution */
216	<	if (!vardefined(vxres))
217	<	varset(vxres, ':', (double)xmax);
218	<	if (!vardefined(vyres))
219	<	varset(vyres, ':', (double)ymax);
217	>	/* get output resolution */
218		xres = varvalue(vxres) + .5;
219		yres = varvalue(vyres) + .5;
220		if (xres <= 0 || yres <= 0) {
#	Line 226 | Line 224 | main(
224		}
225		/* complete header */
226		printargs(argc, argv, stdout);
227	+	if (commvp != NULL) {
228	+	fputs(VIEWSTR, stdout);
229	+	fprintview(commvp, stdout);
230	+	fputc('\n', stdout);
231	+	}
232		if (strcmp(ourfmt, PICFMT))
233		fputformat(ourfmt, stdout);     /* print format if known */
234		putchar('\n');
#	Line 249 | Line 252 | headline(                      /* check header line & echo if requested *
252		void    *p
253		)
254		{
255	<	char    fmt[32];
255	>	int     orig = *(int *)p;
256	>	char    fmt[MAXFMTLEN];
257		double  d;
258		COLOR   ctmp;
259
#	Line 263 | Line 267 | headline(                      /* check header line & echo if requested *
267		wrongformat = globmatch(PICFMT, fmt) ? 1 : -1;
268		return(0);      /* don't echo */
269		}
270	<	if (isexpos(s)) {                       /* exposure */
270	>	if (orig) {                             /* undo exposure? */
271	>	if (isexpos(s)) {
272	>	d = 1./exposval(s);
273	>	scalecolor(input[nfiles].coef, d);
274	>	return(0);      /* don't echo */
275	>	}
276	>	if (iscolcor(s)) {
277	>	int     i;
278	>	colcorval(ctmp, s);
279	>	for (i = 3; i--; )
280	>	colval(input[nfiles].coef,i) /= colval(ctmp,i);
281	>	return(0);      /* don't echo */
282	>	}
283	>	} else if (isexpos(s)) {                /* record exposure? */
284		d = exposval(s);
285		scalecolor(input[nfiles].expos, d);
286	<	} else if (iscolcor(s)) {               /* color correction */
286	>	} else if (iscolcor(s)) {
287		colcorval(ctmp, s);
288		multcolor(input[nfiles].expos, ctmp);
289		} else if (isaspect(s))
#	Line 283 | Line 300 | headline(                      /* check header line & echo if requested *
300
301
302		static void
303	<	checkfile(void)                 /* ready a file */
303	>	checkfile(int orig)                     /* ready a file */
304		{
305		int     i;
306		/* process header */
#	Line 292 | Line 309 | checkfile(void)                        /* ready a file */
309		fputs(input[nfiles].name, stdout);
310		fputs(":\n", stdout);
311		}
312	<	getheader(input[nfiles].fp, headline, NULL);
312	>	getheader(input[nfiles].fp, headline, &orig);
313		if (wrongformat < 0) {
314		eputs(input[nfiles].name);
315		eputs(": not a Radiance picture\n");
#	Line 304 | Line 321 | checkfile(void)                        /* ready a file */
321		}
322		if (!gotview || setview(&input[nfiles].vw) != NULL)
323		input[nfiles].vw.type = 0;
324	+	else if (commvp == NULL)
325	+	commvp = &input[nfiles].vw;
326		if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
327		eputs(input[nfiles].name);
328		eputs(": bad picture size\n");
#	Line 371 | Line 390 | init(void)                                     /* perform final setup */
390		ourbright = xyz_bright;
391		} else
392		varset(vwhteff, ':', WHTEFFICACY);
393	+	/* these may be overridden */
394	+	varset(vxres, ':', (double)xmax);
395	+	varset(vyres, ':', (double)ymax);
396		}
397
398

Diff Legend

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