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.15 by greg, Wed Feb 17 23:26:06 2016 UTC vs.
Revision 2.17 by greg, Thu Aug 18 00:52:48 2016 UTC

#	Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8		*/
9
10		#include <ctype.h>
11	+	#include "platform.h"
12		#include "standard.h"
13		#include "cmatrix.h"
14		#include "platform.h"
#	Line 243 | Line 244 | cm_load(const char *inspec, int nrows, int ncols, int
244		if (sizeof(COLOR) == cm_elem_size[dtype]) {
245		int     nread = 0;
246		do {                            /* read all we can */
247	<	nread += fread(cm->cmem + 3*nread,
247	>	nread += getbinary(cm->cmem + 3*nread,
248		sizeof(COLOR),
249		cm->nrows*cm->ncols - nread,
250		fp);
#	Line 268 | Line 269 | cm_load(const char *inspec, int nrows, int ncols, int
269		if (n <= 0)
270		goto not_handled;
271		while (n--) {
272	<	if (fread(dc, sizeof(double), 3, fp) != 3)
272	>	if (getbinary(dc, sizeof(double), 3, fp) != 3)
273		goto EOFerror;
274		copycolor(cvp, dc);
275		cvp += 3;
#	Line 281 | Line 282 | cm_load(const char *inspec, int nrows, int ncols, int
282		if (n <= 0)
283		goto not_handled;
284		while (n--) {
285	<	if (fread(fc, sizeof(float), 3, fp) != 3)
285	>	if (getbinary(fc, sizeof(float), 3, fp) != 3)
286		goto EOFerror;
287		copycolor(cvp, fc);
288		cvp += 3;
#	Line 434 | Line 435 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
435		if (sizeof(COLOR) == cm_elem_size[dtype]) {
436		r = cm->ncols*cm->nrows;
437		while (r > 0) {
438	<	c = fwrite(mp, sizeof(COLOR), r, fp);
438	>	c = putbinary(mp, sizeof(COLOR), r, fp);
439		if (c <= 0)
440		return(0);
441		mp += 3*c;
#	Line 445 | Line 446 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
446		r = cm->ncols*cm->nrows;
447		while (r--) {
448		copycolor(dc, mp);
449	<	if (fwrite(dc, sizeof(double), 3, fp) != 3)
449	>	if (putbinary(dc, sizeof(double), 3, fp) != 3)
450		return(0);
451		mp += 3;
452		}
#	Line 454 | Line 455 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
455		r = cm->ncols*cm->nrows;
456		while (r--) {
457		copycolor(fc, mp);
458	<	if (fwrite(fc, sizeof(float), 3, fp) != 3)
458	>	if (putbinary(fc, sizeof(float), 3, fp) != 3)
459		return(0);
460		mp += 3;
461		}

Diff Legend

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