ViewVC Help

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

root/Development/ray/src/util/cmatrix.c

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.30 by greg, Fri Jan 15 17:22:23 2021 UTC vs.
Revision 2.33 by greg, Fri Jan 22 16:19:15 2021 UTC

#	Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15		#include "paths.h"
16		#include "resolu.h"
17
18	+	const char      stdin_name[] = "<stdin>";
19	+
20		const char      *cm_fmt_id[] = {
21		"unknown", COLRFMT, CIEFMT,
22		"float", "ascii", "double"
#	Line 212 | Line 214 | CMATRIX *
214		cm_load(const char *inspec, int nrows, int ncols, int dtype)
215		{
216		const int       ROWINC = 2048;
215	–	FILE            *fp = stdin;
217		int             swap = 0;
218	+	FILE            *fp;
219		COLOR           scale;
220		CMATRIX         *cm;
221
222		if (!inspec)
223	<	inspec = "<stdin>";
224	<	else if (inspec[0] == '!') {
223	>	inspec = stdin_name;
224	>	else if (!*inspec)
225	>	return(NULL);
226	>	if (inspec == stdin_name) {             /* reading from stdin? */
227	>	fp = stdin;
228	>	} else if (inspec[0] == '!') {
229		fp = popen(inspec+1, "r");
230		if (!fp) {
231		sprintf(errmsg, "cannot start command '%s'", inspec);
#	Line 309 | Line 315 | cm_load(const char *inspec, int nrows, int ncols, int
315		}
316		} else {                                        /* read binary file */
317		if (sizeof(COLOR) == cm_elem_size[dtype]) {
318	<	int     nread = 0;
318	>	size_t  nread = 0;
319		do {                            /* read all we can */
320		nread += getbinary(cm->cmem + 3*nread,
321		sizeof(COLOR),
322	<	cm->nrows*cm->ncols - nread,
322	>	(size_t)cm->nrows*cm->ncols - nread,
323		fp);
324		if (nrows <= 0) {       /* unknown length */
325	<	if (nread == cm->nrows*cm->ncols)
325	>	if (nread == (size_t)cm->nrows*cm->ncols)
326		/* need more space? */
327		cm = cm_resize(cm, cm->nrows+ROWINC);
328		else if (nread && !(nread % cm->ncols))
#	Line 324 | Line 330 | cm_load(const char *inspec, int nrows, int ncols, int
330		cm = cm_resize(cm, nread/cm->ncols);
331		else            /* ended mid-row */
332		goto EOFerror;
333	<	} else if (nread < cm->nrows*cm->ncols)
333	>	} else if (nread < (size_t)cm->nrows*cm->ncols)
334		goto EOFerror;
335	<	} while (nread < cm->nrows*cm->ncols);
335	>	} while (nread < (size_t)cm->nrows*cm->ncols);
336
337		if (swap) {
338		if (sizeof(COLORV) == 4)
339		swap32((char *)cm->cmem,
340	<	3*cm->nrows*cm->ncols);
340	>	3*(size_t)cm->nrows*cm->ncols);
341		else /* sizeof(COLORV) == 8 */
342		swap64((char *)cm->cmem,
343	<	3*cm->nrows*cm->ncols);
343	>	3*(size_t)cm->nrows*cm->ncols);
344		}
345		} else if (dtype == DTdouble) {
346		double  dc[3];                  /* load from double */
347		COLORV  *cvp = cm->cmem;
348	<	int     n = nrows*ncols;
348	>	size_t  n = (size_t)nrows*ncols;
349
350		if (n <= 0)
351		goto not_handled;
#	Line 353 | Line 359 | cm_load(const char *inspec, int nrows, int ncols, int
359		} else /* dtype == DTfloat */ {
360		float   fc[3];                  /* load from float */
361		COLORV  *cvp = cm->cmem;
362	<	int     n = nrows*ncols;
362	>	size_t  n = (size_t)nrows*ncols;
363
364		if (n <= 0)
365		goto not_handled;

Diff Legend

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