ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/src/px/pcomb.c

Comparing src/px/pcomb.c (file contents):
Revision 2.56 by greg, Mon Nov 20 21:44:29 2023 UTC vs.
Revision 2.57 by greg, Sat Dec 9 23:46:51 2023 UTC

#	Line 23 | Line 23 | struct {
23		FILE    *fp;            /* stream pointer */
24		VIEW    vw;             /* view for picture */
25		RESOLU  rs;             /* image resolution and orientation */
26	+	int     infloat;        /* input is floating point (#comp)? */
27		float   pa;             /* pixel aspect ratio */
28		COLOR   *scan[WINSIZ];  /* input scanline window */
29		COLOR   coef;           /* coefficient */
#	Line 34 | Line 35 | int    nfiles;                         /* number of input files */
35		VIEW    *commvp = NULL;                 /* common view parameters */
36
37		char    ourfmt[MAXFMTLEN] = PICFMT;     /* input picture format */
38	+	int     outfloat = 0;                   /* #component float output? */
39
40		char    StandardInput[] = "<stdin>";
41		char    Command[] = "<Command>";
#	Line 120 | Line 122 | main(
122		echoheader = !echoheader;
123		continue;
124		case 'f':
125	+	if (argv[a][2]) {
126	+	outfloat = (argv[a][2] == 'f');
127	+	continue;
128	+	}
129	+	/* fall through */
130		case 'e':
131		a++;
132		continue;
#	Line 198 | Line 205 | main(
205		case 'h':
206		continue;
207		case 'f':
208	+	if (argv[a][2])
209	+	continue;
210		fpath = getpath(argv[++a], getrlibpath(), 0);
211		if (fpath == NULL) {
212		eputs(argv[0]);
#	Line 222 | Line 231 | main(
231		eputs(": illegal output resolution\n");
232		quit(1);
233		}
234	<	/* complete header */
235	<	printargs(argc, argv, stdout);
234	>	if (!vardefined(vbrtout))               /* single or 3-channel? */
235	>	outfloat *= 3;
236	>
237	>	printargs(argc, argv, stdout);          /* complete header */
238		if (commvp != NULL) {
239		fputs(VIEWSTR, stdout);
240		fprintview(commvp, stdout);
241		fputc('\n', stdout);
242		}
243	<	if (strcmp(ourfmt, PICFMT))
244	<	fputformat(ourfmt, stdout);     /* print format if known */
245	<	putchar('\n');
246	<	fprtresolu(xres, yres, stdout);
247	<	/* combine pictures */
248	<	combine();
243	>	if (outfloat) {                         /* print format if known */
244	>	printf("NROWS=%d\nNCOLS=%d\n", yres, xres);
245	>	fputncomp(outfloat, stdout);
246	>	fputendian(stdout);
247	>	fputformat("float", stdout);
248	>	} else if (strcmp(ourfmt, PICFMT))
249	>	fputformat(ourfmt, stdout);
250	>	fputc('\n', stdout);                    /* end header */
251	>	if (!outfloat)
252	>	fprtresolu(xres, yres, stdout);
253	>
254	>	combine();                              /* combine pictures */
255		quit(0);
256		usage:
257		eputs("Usage: ");
258		eputs(argv[0]);
259		eputs(
260	<	" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] hdr ..]\n");
260	>	" [-w][-h][-ff][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] hdr ..]\n");
261		quit(1);
262		return 1; /* pro forma return */
263		}
#	Line 255 | Line 272 | headline(                      /* check header line & echo if requested *
272		int     orig = *(int *)p;
273		char    fmt[MAXFMTLEN];
274		double  d;
275	+	int     bigend;
276		COLOR   ctmp;
277
278		if (isheadid(s))                        /* header id */
#	Line 263 | Line 281 | headline(                      /* check header line & echo if requested *
281		if (globmatch(ourfmt, fmt)) {
282		wrongformat = 0;
283		strcpy(ourfmt, fmt);
284	<	} else
284	>	} else if (!strcmp("float", fmt))
285	>	input[nfiles].infloat *= -1;
286	>	else
287		wrongformat = globmatch(PICFMT, fmt) ? 1 : -1;
288		return(0);      /* don't echo */
289		}
290	+	if ((bigend = isbigendian(s)) >= 0) {
291	+	if (bigend != nativebigendian()) {
292	+	eputs(input[nfiles].name);
293	+	eputs(": unsupported input byte ordering\n");
294	+	quit(1);
295	+	}
296	+	return(0);      /* don't echo */
297	+	}
298	+	if (!strncmp("NROWS=", s, 6)) {         /* X-resolution */
299	+	input[nfiles].rs.yr = atoi(s+6);
300	+	return(0);      /* don't echo */
301	+	}
302	+	if (!strncmp("NCOLS=", s, 6)) {         /* Y-resolution */
303	+	input[nfiles].rs.xr = atoi(s+6);
304	+	return(0);      /* don't echo */
305	+	}
306	+	if (isncomp(s))                         /* # components */
307	+	input[nfiles].infloat *= ncompval(s);
308	+
309		if (orig) {                             /* undo exposure? */
310		if (isexpos(s)) {
311		d = 1./exposval(s);
#	Line 306 | Line 345 | checkfile(int orig)                    /* ready a file */
345		int     i;
346		/* process header */
347		gotview = 0;
348	+	input[nfiles].infloat = -1;
349	+	input[nfiles].rs.rt = PIXSTANDARD;
350	+	input[nfiles].rs.xr = input[nfiles].rs.yr = 0;
351		if (echoheader) {
352		fputs(input[nfiles].name, stdout);
353		fputs(":\n", stdout);
354		}
355		getheader(input[nfiles].fp, headline, &orig);
356	+
357	+	if (input[nfiles].infloat <= 0)
358	+	input[nfiles].infloat = 0;
359	+	else if ((input[nfiles].infloat != 3) &
360	+	(input[nfiles].infloat != 1)) {
361	+	eputs(input[nfiles].name);
362	+	eputs(": unsupported number of components\n");
363	+	quit(1);
364	+	}
365		if (wrongformat < 0) {
366		eputs(input[nfiles].name);
367	<	eputs(": not a Radiance picture\n");
367	>	eputs(": not a Radiance picture or float matrix\n");
368		quit(1);
369		}
370		if (wrongformat > 0) {
#	Line 324 | Line 375 | checkfile(int orig)                    /* ready a file */
375		input[nfiles].vw.type = 0;
376		else if (commvp == NULL)
377		commvp = &input[nfiles].vw;
378	<	if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
378	>	if ((input[nfiles].rs.xr <= 0) | (input[nfiles].rs.yr <= 0) &&
379	>	!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) {
380		eputs(input[nfiles].name);
381		eputs(": bad picture size\n");
382		quit(1);
#	Line 429 | Line 481 | combine(void)                  /* combine pictures */
481		eclock++;
482		if (brtdef != NULL) {
483		d = evalue(brtdef);
484	<	if (d < 0.0)
433	<	d = 0.0;
484	>	d *= (outfloat > 0) | (d >= 0);
485		setcolor(scanout[xpos], d, d, d);
486		} else {
487		for (j = 0; j < 3; j++) {
#	Line 441 | Line 492 | combine(void)                  /* combine pictures */
492		for (i = 0; i < nfiles; i++)
493		d += colval(input[i].scan[MIDSCN][xscan],j);
494		}
495	<	if (d < 0.0)
445	<	d = 0.0;
495	>	d *= (outfloat > 0) | (d >= 0);
496		colval(scanout[xpos],j) = d;
497		}
498		}
499		}
500	<	if (fwritescan(scanout, xres, stdout) < 0) {
501	<	perror("write error");
502	<	quit(1);
500	>	switch (outfloat) {
501	>	case 3:                     /* writing out float triplets */
502	>	if (fwrite(scanout, sizeof(float)*3, xres, stdout) != xres)
503	>	goto writerr;
504	>	break;
505	>	case 1:                     /* writing out gray float values */
506	>	for (xpos = 0; xpos < xres; xpos++)
507	>	if (putbinary(&scanout[xpos][CIEY],
508	>	sizeof(float), 1, stdout) != 1)
509	>	goto writerr;
510	>	break;
511	>	default:                    /* writing out Radiance picture */
512	>	if (fwritescan(scanout, xres, stdout) < 0)
513	>	goto writerr;
514	>	break;
515		}
516		}
517		efree((char *)scanout);
518	+	return;
519	+	writerr:
520	+	perror("write error");
521	+	quit(1);
522		}
523
524
#	Line 471 | Line 537 | advance(void)                  /* read in data for next scanline */
537		input[i].scan[0] = st;
538		if (yscan <= MIDSCN)            /* hit bottom? */
539		continue;
540	<	if (freadscan(st, xmax, input[i].fp) < 0) {  /* read */
541	<	eputs(input[i].name);
542	<	eputs(": read error\n");
543	<	quit(1);
544	<	}
540	>	/* read scanline */
541	>	if (input[i].infloat) {
542	>	if (fread(st, sizeof(float)*input[i].infloat,
543	>	xmax, input[i].fp) != xmax)
544	>	goto readerr;
545	>	if (input[i].infloat == 1) {
546	>	const COLORV    *f = st[0] + xmax;
547	>	int             x = xmax;
548	>	while (x-- > 0)
549	>	st[x][BLU] = st[x][GRN] =
550	>	st[x][RED] = *--f;
551	>	}
552	>	} else if (freadscan(st, xmax, input[i].fp) < 0)
553	>	goto readerr;
554		for (j = 0; j < xmax; j++)      /* adjust color */
555		multcolor(st[j], input[i].coef);
556		}
557	+	return;
558	+	readerr:
559	+	eputs(input[i].name);
560	+	eputs(": read error\n");
561	+	quit(1);
562		}
563
564
#	Line 609 | Line 689 | l_ray(         /* return ray origin or direction */
689		return((double)nfiles);
690		fn = d - 0.5;
691		if (ltick[fn] != eclock) {              /* need to compute? */
692	<	lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0;
693	<	ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0;
694	<	ldist[fn] = -1.0;
695	<	if (input[fn].vw.type == 0)
692	>	if (input[fn].vw.type == 0) {
693	>	lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0;
694	>	ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0;
695	>	ldist[fn] = -1.0;
696		errno = EDOM;
697	<	else {
697	>	} else {
698		pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan);
699		ldist[fn] = viewray(lorg[fn], ldir[fn],
700		&input[fn].vw, loc[0], loc[1]);
701	+	if (ldist[fn] < -FTINY)
702	+	errno = EDOM;
703		}
704		ltick[fn] = eclock;
705		}

Diff Legend

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