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.5 by greg, Tue Dec 19 20:38:38 2023 UTC vs.
Revision 2.9 by greg, Sun May 19 15:32:24 2024 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9		#include <math.h>
10		#include "platform.h"
11		#include "rtio.h"
12	–	#include "resolu.h"
12		#include "rmatrix.h"
13		#include "calcomp.h"
14		#include "paths.h"
#	Line 391 | Line 390 | apply_op(RMATRIX *dst, const RMATRIX *src, const RUNAR
390		return(0);
391		rmx_free(res);
392		} else if (dst != src)
393	<	memcpy(dst->mtx, src->mtx,
395	<	sizeof(double)*dst->ncomp*dst->ncols*dst->nrows);
393	>	memcpy(dst->mtx, src->mtx, rmx_array_size(dst));
394		if (ro->nsf == dst->ncomp)
395		rmx_scale(dst, ro->sca);
396		return(1);
#	Line 680 | Line 678 | resize_inparr(int n2alloc)
678		{
679		int     i;
680
681	<	for (i = nmats; i > n2alloc; i--) {
681	>	if (n2alloc == nall)
682	>	return;
683	>	for (i = nall; i > n2alloc; i--) {
684		rmx_reset(&mop[i].imx);
685		if (mop[i].rmp != &mop[i].imx)
686		rmx_free(mop[i].rmp);
#	Line 690 | Line 690 | resize_inparr(int n2alloc)
690		fputs("Out of memory in resize_inparr()\n", stderr);
691		exit(1);
692		}
693	<	if (n2alloc > nmats)
694	<	memset(mop+nmats, 0, (n2alloc-nmats)*sizeof(ROPMAT));
693	>	if (n2alloc > nall)
694	>	memset(mop+nall, 0, (n2alloc-nall)*sizeof(ROPMAT));
695		nall = n2alloc;
696		}
697
#	Line 868 | Line 868 | main(int argc, char *argv[])
868		fprintf(stderr, "%s: unsupported output format\n", argv[0]);
869		return(1);
870		}
871	+	doptimize(1);                   /* optimize definitions */
872		/* process & write rows */
873		return(combine_input(&mop[nmats], stdout) ? 0 : 1);
874		stdin_error:

Diff Legend

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