ViewVC Help

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

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

Comparing ray/src/util/rcomb.c (file contents):
Revision 2.24 by greg, Mon Jun 10 18:20:06 2024 UTC vs.
Revision 2.27 by greg, Sat Mar 1 01:37:49 2025 UTC

#	Line 174 | Line 174 | xyzrow(ROPMAT *rop, int r, int p)
174
175		/* Use the spectral sensitivity function to compute matrix coefficients */
176		void
177	<	sensrow(ROPMAT *rop, int r, double (*sf)(SCOLOR sc, int ncs, const float wlpt[4]))
177	>	sensrow(ROPMAT *rop, int r, double (*sf)(const SCOLOR sc, int ncs, const float wlpt[4]))
178		{
179		const int       nc = rop->imx.ncomp;
180		int             i;
#	Line 673 | Line 673 | parent_loop(void)
673		if (!rmx_load_row(mop[i].imx.mtx, &mop[i].imx, mop[i].infp)) {
674		if (cur_row > in_nrows) /* unknown #input rows? */
675		break;
676	<	fprintf(stderr, "%s: parent_loop() load error at row %d\n",
676	>	fprintf(stderr, "%s: load error at row %d\n",
677		mop[i].inspec, cur_row);
678		return(0);
679		}
#	Line 682 | Line 682 | parent_loop(void)
682		for (i = 0; i < nmats; i++)
683		if (writebuf(wfd, mop[i].imx.mtx, rmx_array_size(&mop[i].imx))
684		!= rmx_array_size(&mop[i].imx)) {
685	<	fprintf(stderr, "%s: parent_loop() write error at row %d\n",
685	>	fprintf(stderr, "%s: write error at row %d\n",
686		mop[i].inspec, cur_row);
687		return(0);
688		}
#	Line 691 | Line 691 | parent_loop(void)
691		free(cproc); cproc = NULL; nchildren = 0;
692		if (i < 0) {
693		if (!nowarn)
694	<	fputs("Warning: lost child in parent_loop()\n", stderr);
694	>	fputs("Warning: lost child process\n", stderr);
695		return(1);
696		}
697		if (i > 0) {
#	Line 737 | Line 737 | combine_input(void)
737		if (!rmx_load_row(mop[i].imx.mtx, &mop[i].imx, mop[i].infp)) {
738		if (cur_row > in_nrows) /* unknown #input rows? */
739		break;
740	<	fprintf(stderr, "%s: combine_input() load error at row %d\n",
740	>	fprintf(stderr, "%s: load error at row %d\n",
741		mop[i].inspec, cur_row);
742		return(0);
743		}
#	Line 785 | Line 785 | combine_input(void)
785		if (!rmx_write_data(res->rmp->mtx, res->rmp->ncomp,
786		res->rmp->ncols, res->rmp->dtype, stdout) ||
787		(inchild >= 0 && fflush(stdout) == EOF)) {
788	<	fprintf(stderr, "Conversion/write error at row %d in combine_input()\n",
788	>	fprintf(stderr, "Conversion/write error at row %d\n",
789		cur_row);
790		return(0);
791		}
792		}
793		return(inchild >= 0 || fflush(stdout) != EOF);
794		multerror:
795	<	fputs("Unexpected matrix multiply error in combine_input()\n", stderr);
795	>	fputs("Unexpected matrix multiply error\n", stderr);
796		return(0);
797		}
798
#	Line 821 | Line 821 | output_loop(void)
821		if (!rv)                                /* out of rows? */
822		break;
823		if (rv != row_size) {
824	<	fputs("Read error in output_loop()\n", stderr);
824	>	fputs("Read error\n", stderr);
825		return(0);
826		}                                       /* do final conversion */
827		if (!rmx_write_data(mop[nmats].rmp->mtx, mop[nmats].rmp->ncomp,
828		mop[nmats].rmp->ncols, mop[nmats].rmp->dtype, stdout)) {
829	<	fputs("Conversion/write error in output_loop()\n", stderr);
829	>	fputs("Conversion/write error\n", stderr);
830		return(0);
831		}
832		cur_child++;
#	Line 852 | Line 852 | resize_inparr(int n2alloc)
852
853		if (n2alloc == nall)
854		return;
855	<	for (i = nall; i > n2alloc; i--) {
855	>	for (i = nall; i-- > n2alloc; ) {
856		rmx_reset(&mop[i].imx);
857		if (mop[i].rmp != &mop[i].imx)
858		rmx_free(mop[i].rmp);

Diff Legend

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