ViewVC Help

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

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

Comparing ray/src/common/normcodec.c (file contents):
Revision 2.1 by greg, Fri Jul 26 16:18:06 2019 UTC vs.
Revision 2.2 by greg, Fri Jul 26 17:04:12 2019 UTC

#	Line 46 | Line 46 | process_nc_header(NORMCODEC *ncp, int ac, char *av[])
46		{
47		if (ncp->hdrflags & HF_HEADIN &&
48		getheader(ncp->finp, headline, ncp) < 0) {
49	<	fputs(ncp->inpname, stderr);
50	<	fputs(": bad header\n", stderr);
51	<	return 1;
49	>	if (ncp->hdrflags & HF_STDERR) {
50	>	fputs(ncp->inpname, stderr);
51	>	fputs(": bad header\n", stderr);
52	>	}
53	>	return 0;
54		}
55		if (ncp->hdrflags & HF_HEADOUT) {       /* finish header */
56		if (!(ncp->hdrflags & HF_HEADIN))
#	Line 73 | Line 75 | process_nc_header(NORMCODEC *ncp, int ac, char *av[])
75		}
76		/* get/put resolution string */
77		if (ncp->hdrflags & HF_RESIN && !fgetsresolu(&ncp->res, ncp->finp)) {
78	<	fputs(ncp->inpname, stderr);
79	<	fputs(": bad resolution string\n", stderr);
80	<	return 1;
78	>	if (ncp->hdrflags & HF_STDERR) {
79	>	fputs(ncp->inpname, stderr);
80	>	fputs(": bad resolution string\n", stderr);
81	>	}
82	>	return 0;
83		}
84		if (ncp->hdrflags & HF_RESOUT)
85		fputsresolu(&ncp->res, stdout);
#	Line 90 | Line 94 | int
94		check_decode_normals(NORMCODEC *ncp)
95		{
96		if (ncp->hdrflags & HF_ENCODE) {
97	<	fputs(progname, stderr);
98	<	fputs(": wrong header mode for decode\n", stderr);
97	>	if (ncp->hdrflags & HF_STDERR) {
98	>	fputs(progname, stderr);
99	>	fputs(": wrong header mode for decode\n", stderr);
100	>	}
101		return 0;
102		}
103		if (ncp->inpfmt[0] && strcmp(ncp->inpfmt, NORMAL32FMT)) {
104	<	fputs(ncp->inpname, stderr);
105	<	fputs(": unexpected input format: ", stderr);
106	<	fputs(ncp->inpfmt, stderr);
107	<	fputc('\n', stderr);
104	>	if (ncp->hdrflags & HF_STDERR) {
105	>	fputs(ncp->inpname, stderr);
106	>	fputs(": unexpected input format: ", stderr);
107	>	fputs(ncp->inpfmt, stderr);
108	>	fputc('\n', stderr);
109	>	}
110		return 0;
111		}
112		return 1;
#	Line 129 | Line 137 | seek_nc_pix(NORMCODEC *ncp, int x, int y)
137		long    seekpos;
138
139		if ((ncp->res.xr <= 0) | (ncp->res.yr <= 0)) {
140	<	fputs(progname, stderr);
141	<	fputs(": need map resolution to seek\n", stderr);
140	>	if (ncp->hdrflags & HF_STDERR) {
141	>	fputs(progname, stderr);
142	>	fputs(": need map resolution to seek\n", stderr);
143	>	}
144		return -1;
145		}
146		if ((x < 0) | (y < 0) ||
147		(x >= scanlen(&ncp->res)) | (y >= numscans(&ncp->res))) {
148	<	fputs(ncp->inpname, stderr);
149	<	fputs(": warning - pixel index off map\n", stderr);
148	>	if (ncp->hdrflags & HF_STDERR) {
149	>	fputs(ncp->inpname, stderr);
150	>	fputs(": warning - pixel index off map\n", stderr);
151	>	}
152		return 0;
153		}
154		seekpos = ncp->dstart + 4*((long)y*scanlen(&ncp->res) + x);
155
156		if (seekpos != ncp->curpos &&
157		fseek(ncp->finp, seekpos, SEEK_SET) == EOF) {
158	<	fputs(ncp->inpname, stderr);
159	<	fputs(": seek error\n", stderr);
158	>	if (ncp->hdrflags & HF_STDERR) {
159	>	fputs(ncp->inpname, stderr);
160	>	fputs(": seek error\n", stderr);
161	>	}
162		return -1;
163		}
164		ncp->curpos = seekpos;

Diff Legend

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