ViewVC Help

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

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

Comparing ray/src/common/depthcodec.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 83 | Line 83 | headline(char *s, void *p)
83		*cp = '\0';
84		dcp->refdepth = atof(dcp->depth_unit);
85		if (dcp->refdepth <= .0) {
86	<	fputs(dcp->inpname, stderr);
87	<	fputs(": bad reference depth in input header\n", stderr);
86	>	if (dcp->hdrflags & HF_STDERR) {
87	>	fputs(dcp->inpname, stderr);
88	>	fputs(": bad reference depth in input header\n",
89	>	stderr);
90	>	}
91		return -1;
92		}
93		} else if (isview(s))           /* get view params */
#	Line 101 | Line 104 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
104		{
105		if (dcp->hdrflags & HF_HEADIN &&
106		getheader(dcp->finp, headline, dcp) < 0) {
107	<	fputs(dcp->inpname, stderr);
108	<	fputs(": bad header\n", stderr);
109	<	return 1;
107	>	if (dcp->hdrflags & HF_STDERR) {
108	>	fputs(dcp->inpname, stderr);
109	>	fputs(": bad header\n", stderr);
110	>	}
111	>	return 0;
112		}
113		if (dcp->hdrflags & HF_HEADOUT) {       /* finish header */
114		if (!(dcp->hdrflags & HF_HEADIN))
#	Line 131 | Line 136 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
136		}
137		/* get/put resolution string */
138		if (dcp->hdrflags & HF_RESIN && !fgetsresolu(&dcp->res, dcp->finp)) {
139	<	fputs(dcp->inpname, stderr);
140	<	fputs(": bad resolution string\n", stderr);
141	<	return 1;
139	>	if (dcp->hdrflags & HF_STDERR) {
140	>	fputs(dcp->inpname, stderr);
141	>	fputs(": bad resolution string\n", stderr);
142	>	}
143	>	return 0;
144		}
145		if (dcp->hdrflags & HF_RESOUT)
146		fputsresolu(&dcp->res, stdout);
#	Line 148 | Line 155 | int
155		check_decode_depths(DEPTHCODEC *dcp)
156		{
157		if (dcp->hdrflags & HF_ENCODE) {
158	<	fputs(progname, stderr);
159	<	fputs(": wrong header mode for decode\n", stderr);
158	>	if (dcp->hdrflags & HF_STDERR) {
159	>	fputs(progname, stderr);
160	>	fputs(": wrong header mode for decode\n", stderr);
161	>	}
162		return 0;
163		}
164		if (dcp->inpfmt[0] && strcmp(dcp->inpfmt, DEPTH16FMT)) {
165	<	fputs(dcp->inpname, stderr);
166	<	fputs(": unexpected input format: ", stderr);
167	<	fputs(dcp->inpfmt, stderr);
168	<	fputc('\n', stderr);
165	>	if (dcp->hdrflags & HF_STDERR) {
166	>	fputs(dcp->inpname, stderr);
167	>	fputs(": unexpected input format: ", stderr);
168	>	fputs(dcp->inpfmt, stderr);
169	>	fputc('\n', stderr);
170	>	}
171		return 0;
172		}
173		return 1;
#	Line 172 | Line 183 | check_decode_worldpos(DEPTHCODEC *dcp)
183		if (!check_decode_depths(dcp))
184		return 0;
185		if ((dcp->res.xr <= 0) | (dcp->res.yr <= 0)) {
186	<	fputs(progname, stderr);
187	<	fputs(": missing map resolution\n", stderr);
186	>	if (dcp->hdrflags & HF_STDERR) {
187	>	fputs(progname, stderr);
188	>	fputs(": missing map resolution\n", stderr);
189	>	}
190		return 0;
191		}
192		if (!dcp->gotview) {
193	<	fputs(dcp->inpname, stderr);
194	<	fputs(": missing view\n", stderr);
193	>	if (dcp->hdrflags & HF_STDERR) {
194	>	fputs(dcp->inpname, stderr);
195	>	fputs(": missing view\n", stderr);
196	>	}
197		return 0;
198		}
199		if ((err = setview(&dcp->vw)) != NULL) {
200	<	fputs(dcp->inpname, stderr);
201	<	fputs(": input view error: ", stderr);
202	<	fputs(err, stderr);
203	<	fputc('\n', stderr);
200	>	if (dcp->hdrflags & HF_STDERR) {
201	>	fputs(dcp->inpname, stderr);
202	>	fputs(": input view error: ", stderr);
203	>	fputs(err, stderr);
204	>	fputc('\n', stderr);
205	>	}
206		return 0;
207		}
208		return 1;
#	Line 252 | Line 269 | seek_dc_pix(DEPTHCODEC *dcp, int x, int y)
269		long    seekpos;
270
271		if ((dcp->res.xr <= 0) | (dcp->res.yr <= 0)) {
272	<	fputs(progname, stderr);
273	<	fputs(": need map resolution to seek\n", stderr);
272	>	if (dcp->hdrflags & HF_STDERR) {
273	>	fputs(progname, stderr);
274	>	fputs(": need map resolution to seek\n", stderr);
275	>	}
276		return -1;
277		}
278		if ((x < 0) | (y < 0) ||
279		(x >= scanlen(&dcp->res)) | (y >= numscans(&dcp->res))) {
280	<	fputs(dcp->inpname, stderr);
281	<	fputs(": warning - pixel index off map\n", stderr);
280	>	if (dcp->hdrflags & HF_STDERR) {
281	>	fputs(dcp->inpname, stderr);
282	>	fputs(": warning - pixel index off map\n", stderr);
283	>	}
284		return 0;
285		}
286		seekpos = dcp->dstart + 2*((long)y*scanlen(&dcp->res) + x);
287
288		if (seekpos != dcp->curpos &&
289		fseek(dcp->finp, seekpos, SEEK_SET) == EOF) {
290	<	fputs(dcp->inpname, stderr);
291	<	fputs(": seek error\n", stderr);
290	>	if (dcp->hdrflags & HF_STDERR) {
291	>	fputs(dcp->inpname, stderr);
292	>	fputs(": seek error\n", stderr);
293	>	}
294		return -1;
295		}
296		dcp->curpos = seekpos;

Diff Legend

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