[ViewVC] Diff of: radiance/ray/src/util/rmatrix.c

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.25 by greg, Mon Aug 28 15:59:46 2017 UTC vs.
Revision 2.26 by greg, Mon Apr 9 21:30:07 2018 UTC

#	Line 146 \| Line 146 \| *rmx_load_float(RMATRIX rm, FILE fp)*
146		static int
147		rmx_load_double(RMATRIX rm, FILE fp)
148		{
149	<	int i, j, k;
150	<	double val[100];
149	>	int i, j;
150
152	–	if (rm->ncomp > 100) {
153	–	fputs("Unsupported # components in rmx_load_double()\n", stderr);
154	–	exit(1);
155	–	}
151		for (i = 0; i < rm->nrows; i++)
152	<	for (j = 0; j < rm->ncols; j++) {
153	<	if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
152	>	for (j = 0; j < rm->ncols; j++)
153	>	if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
154		return(0);
160	–	for (k = rm->ncomp; k--; )
161	–	rmx_lval(rm,i,j,k) = val[k];
162	–	}
155		return(1);
156		}
157
#	Line 334 \| Line 326 \| *rmx_write_float(const RMATRIX rm, FILE fp)*
326		static int
327		rmx_write_double(const RMATRIX rm, FILE fp)
328		{
329	<	int i, j, k;
338	<	double val[100];
329	>	int i, j;
330
340	–	if (rm->ncomp > 100) {
341	–	fputs("Unsupported # components in rmx_write_double()\n", stderr);
342	–	exit(1);
343	–	}
331		for (i = 0; i < rm->nrows; i++)
332	<	for (j = 0; j < rm->ncols; j++) {
333	<	for (k = rm->ncomp; k--; )
347	<	val[k] = rmx_lval(rm,i,j,k);
348	<	if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
332	>	for (j = 0; j < rm->ncols; j++)
333	>	if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
334		return(0);
350	–	}
335		return(1);
336		}
337

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines