ViewVC Help

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

root/Development/ray/src/common/header.c

Comparing ray/src/common/header.c (file contents):
Revision 2.43 by greg, Fri Mar 4 17:16:12 2022 UTC vs.
Revision 2.48 by greg, Mon Mar 21 17:03:51 2022 UTC

#	Line 31 | Line 31 | static const char      RCSid[] = "$Id$";
31
32		#include  "tiff.h"      /* for int32 */
33		#include  "rtio.h"
34	+	#include  "color.h"
35		#include  "resolu.h"
36
37		#define  MAXLINE        2048
#	Line 190 | Line 191 | formatval(                     /* get format value (return true if forma
191		{
192		const char  *cp = FMTSTR;
193		char  *r = fmt;
194	<
194	>	/* check against format string */
195		while (*cp) if (*cp++ != *s++) return(0);
196		while (isspace(*s)) s++;
197		if (!*s) return(0);
198	<	if (r == NULL) return(1);
199	<	do
198	>	if (r == NULL)          /* just checking if format? */
199	>	return(1);
200	>	do                      /* copy format ID */
201		*r++ = *s++;
202	<	while (*s && !isspace(*s) && r-fmt < MAXFMTLEN-1);
203	<	*r = '\0';
202	>	while (*s && r-fmt < MAXFMTLEN-1);
203	>
204	>	do                      /* remove trailing white space */
205	>	*r-- = '\0';
206	>	while (r > fmt && isspace(*r));
207	>
208		return(1);
209		}
210
#	Line 214 | Line 220 | fputformat(            /* put out a format value */
220		fputs(FMTSTR, fp);
221		fputs(s, fp);
222		/* pad to align binary type for mmap() */
223	<	if (!strncmp(s, "float", 5))
223	>	if (globmatch(PICFMT, s))
224	>	align = 0;      /* not needed for picture data */
225	>	else if (!strncmp("float", s, 5))
226		align = sizeof(float);
227	<	else if (!strncmp(s, "double", 6))
227	>	else if (!strncmp("double", s, 6))
228		align = sizeof(double);
229	<	else if (!strncmp(s, "16-bit", 6))
229	>	else if (!strncmp("16-bit", s, 6))
230		align = 2;
231	<	else if (!strncmp(s, "32-bit", 6))
231	>	else if (!strncmp("32-bit", s, 6))
232		align = 4;
233	<	else if (!strncmp(s, "64-bit", 6))
233	>	else if (!strncmp("64-bit", s, 6))
234		align = 8;
235		if (align) {
236		long    pos = ftell(fp);
#	Line 360 | Line 368 | globmatch(                     /* check for match of s against pattern p
368		while (*s++);
369		return(0);
370		case '[':                       /* character set */
371	<	setmatch = *s == *++p;
371	>	setmatch = (*s == *++p);
372		if (!*p)
373		return(0);
374		while (*++p != ']') {
375		if (!*p)
376		return(0);
377		if (*p == '-') {
378	<	setmatch += (p[-1] <= *s && *s <= p[1]);
378	>	setmatch += (p[-1] <= *s) & (*s <= p[1]);
379		if (!*++p)
380		break;
381		} else
#	Line 378 | Line 386 | globmatch(                     /* check for match of s against pattern p
386		s++;
387		break;
388		case '\\':                      /* literal next */
389	<	p++;
389	>	if (!*++p)
390	>	return(0);
391		/* fall through */
392		default:                        /* normal character */
393		if (*p != *s)

Diff Legend

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