ViewVC Help

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

root/Development/ray/src/rt/rtrace.c

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.68 by greg, Fri Apr 11 20:27:23 2014 UTC vs.
Revision 2.69 by greg, Thu Mar 3 22:38:34 2016 UTC

#	Line 410 | Line 410 | getvec(                /* get a vector from fp */
410		}
411		break;
412		case 'f':                                       /* binary float */
413	<	if (fread((char *)vf, sizeof(float), 3, fp) != 3)
413	>	if (getbinary((char *)vf, sizeof(float), 3, fp) != 3)
414		return(-1);
415		VCOPY(vec, vf);
416		break;
417		case 'd':                                       /* binary double */
418	<	if (fread((char *)vd, sizeof(double), 3, fp) != 3)
418	>	if (getbinary((char *)vd, sizeof(double), 3, fp) != 3)
419		return(-1);
420		VCOPY(vec, vd);
421		break;
#	Line 519 | Line 519 | oputv(                         /* print value */
519		setcolr(cout,   colval(r->rcol,RED),
520		colval(r->rcol,GRN),
521		colval(r->rcol,BLU));
522	<	fwrite(cout, sizeof(cout), 1, stdout);
522	>	putbinary(cout, sizeof(cout), 1, stdout);
523		return;
524		}
525		cval[0] = colval(r->rcol,RED);
#	Line 720 | Line 720 | putd(RREAL *v, int n)          /* print binary double(s) */
720		error(INTERNAL, "code error in putd()");
721		for (i = n; i--; )
722		da[i] = v[i];
723	<	fwrite(da, sizeof(double), n, stdout);
723	>	putbinary(da, sizeof(double), n, stdout);
724		#else
725	<	fwrite(v, sizeof(RREAL), n, stdout);
725	>	putbinary(v, sizeof(RREAL), n, stdout);
726		#endif
727		}
728
#	Line 738 | Line 738 | putf(RREAL *v, int n)          /* print binary float(s) */
738		error(INTERNAL, "code error in putf()");
739		for (i = n; i--; )
740		fa[i] = v[i];
741	<	fwrite(fa, sizeof(float), n, stdout);
741	>	putbinary(fa, sizeof(float), n, stdout);
742		#else
743	<	fwrite(v, sizeof(RREAL), n, stdout);
743	>	putbinary(v, sizeof(RREAL), n, stdout);
744		#endif
745		}

Diff Legend

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