ViewVC Help

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

root/radiance/src/px/pcond.c

Comparing src/px/pcond.c (file contents):
Revision 3.31 by greg, Wed Apr 7 21:13:52 2021 UTC vs.
Revision 3.33 by greg, Wed Sep 11 18:56:11 2024 UTC

#	Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8
9		#include "platform.h"
10		#include "paths.h"
11	–	#include "paths.h"
11		#include "pcond.h"
12
13
#	Line 220 | Line 219 | headline(                              /* process header line */
219		char    fmt[MAXFMTLEN];
220
221		if (formatval(fmt, s)) {        /* check if format string */
222	<	if (!strcmp(fmt,COLRFMT)) lumf = rgblum;
223	<	else if (!strcmp(fmt,CIEFMT)) lumf = cielum;
224	<	else lumf = NULL;
222	>	if (!strcmp(fmt,COLRFMT) || !strcmp(fmt,SPECFMT))
223	>	lumf = rgblum;
224	>	else if (!strcmp(fmt,CIEFMT))
225	>	lumf = cielum;
226	>	else
227	>	lumf = NULL;
228		return(0);              /* don't echo */
229		}
230	+	if (isncomp(s)) {
231	+	NCSAMP = ncompval(s);
232	+	return(0);
233	+	}
234	+	if (iswlsplit(s)) {
235	+	wlsplitval(WLPART, s);
236	+	return(0);
237	+	}
238		/* get input primaries */
239		if (isprims(s) && primsval(inprimS, s)) {
240		inprims = inprimS;
#	Line 349 | Line 359 | getfovimg(void)                        /* load foveal sampled image */
359		if (fgetresolu(&x, &y, fp) < 0 || (x != fvxr) | (y != fvyr))
360		goto readerr;
361		for (y = 0; y < fvyr; y++)
362	<	if (freadscan(fovscan(y), fvxr, fp) < 0)
362	>	if (fread2scan(fovscan(y), fvxr, fp, NCSAMP, WLPART) < 0)
363		goto readerr;
364		pclose(fp);
365		return;

Diff Legend

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