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.11 by greg, Tue Jan 26 18:47:25 2021 UTC vs.
Revision 2.12 by greg, Thu Mar 3 16:09:31 2022 UTC

#	Line 122 | Line 122 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
122		return 0;
123		}
124		dcp->gotview *= (dcp->gotview > 0);
125	+	/* get resolution string? */
126	+	if (dcp->hdrflags & HF_RESIN && !fgetsresolu(&dcp->res, dcp->finp)) {
127	+	if (dcp->hdrflags & HF_STDERR) {
128	+	fputs(dcp->inpname, stderr);
129	+	fputs(": bad resolution string\n", stderr);
130	+	}
131	+	return 0;
132	+	}
133		if (dcp->hdrflags & HF_HEADOUT) {       /* finish header */
134		if (!(dcp->hdrflags & HF_HEADIN))
135		newheader("RADIANCE", stdout);
#	Line 132 | Line 140 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
140		fputs(dcp->depth_unit, stdout);
141		fputc('\n', stdout);
142		fputformat(DEPTH16FMT, stdout);
143	<	} else
143	>	} else {
144	>	fputs("NCOMP=1\n", stdout);
145	>	if ((dcp->hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESIN)
146	>	printf("NCOLS=%d\nNROWS=%d\n",
147	>	scanlen(&dcp->res),
148	>	numscans(&dcp->res));
149		switch (dcp->format) {
150		case 'a':
151		fputformat("ascii", stdout);
#	Line 146 | Line 159 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
159		fputformat("double", stdout);
160		break;
161		}
162	+	}
163		fputc('\n', stdout);
164		}
165	<	/* get/put resolution string */
152	<	if (dcp->hdrflags & HF_RESIN && !fgetsresolu(&dcp->res, dcp->finp)) {
153	<	if (dcp->hdrflags & HF_STDERR) {
154	<	fputs(dcp->inpname, stderr);
155	<	fputs(": bad resolution string\n", stderr);
156	<	}
157	<	return 0;
158	<	}
159	<	if (dcp->hdrflags & HF_RESOUT)
165	>	if (dcp->hdrflags & HF_RESOUT)  /* put resolution string? */
166		fputsresolu(&dcp->res, stdout);
167
168		dcp->dstart = dcp->curpos = ftell(dcp->finp);

Diff Legend

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