ViewVC Help

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

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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.82 by greg, Thu Jun 6 17:01:05 2024 UTC vs.
Revision 2.102 by greg, Thu Oct 30 16:47:54 2025 UTC

#	Line 20 | Line 20 | static const char      rmx_mismatch_warn[] = "WARNING: data
20
21		/* Initialize a RMATRIX struct but don't allocate array space */
22		RMATRIX *
23	<	rmx_new(int nr, int nc, int n)
23	>	rmx_new(int nr, int nc, int ncomp)
24		{
25		RMATRIX *dnew;
26
27	<	if (n <= 0)
27	>	if (ncomp <= 0)
28		return(NULL);
29
30		dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
#	Line 34 | Line 34 | rmx_new(int nr, int nc, int n)
34		dnew->dtype = DTrmx_native;
35		dnew->nrows = nr;
36		dnew->ncols = nc;
37	<	dnew->ncomp = n;
37	>	dnew->ncomp = ncomp;
38		setcolor(dnew->cexp, 1.f, 1.f, 1.f);
39		memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart));
40
#	Line 46 | Line 46 | int
46		rmx_prepare(RMATRIX *rm)
47		{
48		if (!rm) return(0);
49	<	if (rm->mtx)
49	>	if (rm->mtx)                    /* assume it's right size */
50		return(1);
51		if ((rm->nrows <= 0) | (rm->ncols <= 0) | (rm->ncomp <= 0))
52		return(0);
#	Line 57 | Line 57 | rmx_prepare(RMATRIX *rm)
57
58		/* Call rmx_new() and rmx_prepare() */
59		RMATRIX *
60	<	rmx_alloc(int nr, int nc, int n)
60	>	rmx_alloc(int nr, int nc, int ncomp)
61		{
62	<	RMATRIX *dnew = rmx_new(nr, nc, n);
62	>	RMATRIX *dnew = rmx_new(nr, nc, ncomp);
63
64	<	if (dnew && !rmx_prepare(dnew)) {
64	>	if (!rmx_prepare(dnew)) {
65		rmx_free(dnew);
66	<	dnew = NULL;
66	>	return(NULL);
67		}
68		return(dnew);
69		}
#	Line 116 | Line 116 | rmx_newtype(int dtyp1, int dtyp2)
116		int
117		rmx_addinfo(RMATRIX *rm, const char *info)
118		{
119	<	int     oldlen = 0;
119	>	size_t  oldlen = 0;
120
121		if (!rm || !info || !*info)
122		return(0);
123		if (!rm->info) {
124		rm->info = (char *)malloc(strlen(info)+1);
125	–	if (rm->info) rm->info[0] = '\0';
125		} else {
126		oldlen = strlen(rm->info);
127		rm->info = (char *)realloc(rm->info,
#	Line 141 | Line 140 | get_dminfo(char *s, void *p)
140		char    fmt[MAXFMTLEN];
141		int     i;
142
143	<	if (headidval(NULL, s))
143	>	if (isheadid(s))
144		return(0);
145		if (isncomp(s)) {
146		ip->ncomp = ncompval(s);
147	<	return(0);
147	>	return(ip->ncomp - 1);
148		}
149		if (!strncmp(s, "NROWS=", 6)) {
150		ip->nrows = atoi(s+6);
151	<	return(0);
151	>	return(ip->nrows - 1);
152		}
153		if (!strncmp(s, "NCOLS=", 6)) {
154		ip->ncols = atoi(s+6);
155	<	return(0);
155	>	return(ip->ncols - 1);
156		}
157		if ((i = isbigendian(s)) >= 0) {
158		if (nativebigendian() != i)
#	Line 165 | Line 164 | get_dminfo(char *s, void *p)
164		if (isexpos(s)) {
165		float   f = exposval(s);
166		scalecolor(ip->cexp, f);
167	<	return(0);
167	>	return(f > .0 ? 0 : -1);
168		}
169		if (iscolcor(s)) {
170		COLOR   ctmp;
171	<	colcorval(ctmp, s);
171	>	if (!colcorval(ctmp, s)) return(-1);
172		multcolor(ip->cexp, ctmp);
173		return(0);
174		}
175	<	if (iswlsplit(s)) {
176	<	wlsplitval(ip->wlpart, s);
177	<	return(0);
179	<	}
175	>	if (iswlsplit(s))
176	>	return(wlsplitval(ip->wlpart, s) - 1);
177	>
178		if (!formatval(fmt, s)) {
179		rmx_addinfo(ip, s);
180		return(0);
#	Line 186 | Line 184 | get_dminfo(char *s, void *p)
184		ip->dtype = i;
185		return(0);
186		}
187	<	return(-1);
187	>	return(-1);             /* bad format */
188		}
189
190		static int
#	Line 196 | Line 194 | rmx_load_ascii(rmx_dtype *drp, const RMATRIX *rm, FILE
194
195		for (j = 0; j < rm->ncols; j++)
196		for (k = rm->ncomp; k-- > 0; )
197	<	if (fscanf(fp, "%lf", drp++) != 1)
197	>	if (fscanf(fp, rmx_scanfmt, drp++) != 1)
198		return(0);
199		return(1);
200		}
#	Line 204 | Line 202 | rmx_load_ascii(rmx_dtype *drp, const RMATRIX *rm, FILE
202		static int
203		rmx_load_float(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
204		{
205	+	#if DTrmx_native==DTfloat
206	+	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
207	+	return(0);
208	+	if (rm->pflags & RMF_SWAPIN)
209	+	swap32((char *)drp, rm->ncols*rm->ncomp);
210	+	#else
211		int     j, k;
212	<	float   val[100];
212	>	float   val[MAXCOMP];
213
214	<	if (rm->ncomp > 100) {
214	>	if (rm->ncomp > MAXCOMP) {
215		fputs("Unsupported # components in rmx_load_float()\n", stderr);
216		exit(1);
217		}
#	Line 219 | Line 223 | rmx_load_float(rmx_dtype *drp, const RMATRIX *rm, FILE
223		for (k = 0; k < rm->ncomp; k++)
224		*drp++ = val[k];
225		}
226	+	#endif
227		return(1);
228		}
229
230		static int
231		rmx_load_double(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
232		{
233	+	#if DTrmx_native==DTdouble
234		if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
235		return(0);
236		if (rm->pflags & RMF_SWAPIN)
237		swap64((char *)drp, rm->ncols*rm->ncomp);
238	+	#else
239	+	int     j, k;
240	+	double  val[MAXCOMP];
241	+
242	+	if (rm->ncomp > MAXCOMP) {
243	+	fputs("Unsupported # components in rmx_load_double()\n", stderr);
244	+	exit(1);
245	+	}
246	+	for (j = 0; j < rm->ncols; j++) {
247	+	if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
248	+	return(0);
249	+	if (rm->pflags & RMF_SWAPIN)
250	+	swap64((char *)val, rm->ncomp);
251	+	for (k = 0; k < rm->ncomp; k++)
252	+	*drp++ = (float)val[k];
253	+	}
254	+	#endif
255		return(1);
256		}
257
#	Line 255 | Line 278 | rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE
278		return(1);
279		}
280
281	+	#if DTrmx_native==DTfloat
282		static int
283		rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
284		{
285	<	uby8    *scan;
286	<	SCOLOR  scol;
285	>	COLRV   *scan;
286	>	int     j;
287	>
288	>	if ((rm->ncomp < 3) | (rm->ncomp > MAXCOMP))
289	>	return(0);
290	>	scan = (COLRV *)tempbuffer((rm->ncomp+1)*rm->ncols);
291	>	if (!scan)
292	>	return(0);
293	>	if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0)
294	>	return(0);
295	>	for (j = 0; j < rm->ncols; j++, drp += rm->ncomp)
296	>	scolr2scolor(drp, scan+j*(rm->ncomp+1), rm->ncomp);
297	>	return(1);
298	>	}
299	>	#else
300	>	static int
301	>	rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
302	>	{
303	>	COLRV   *scan;
304	>	COLORV  scol[MAXCOMP];
305		int     j, k;
306
307	<	if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP))
307	>	if ((rm->ncomp < 3) | (rm->ncomp > MAXCOMP))
308		return(0);
309	<	scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols);
309	>	scan = (COLRV *)tempbuffer((rm->ncomp+1)*rm->ncols);
310		if (!scan)
311		return(0);
312		if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0)
#	Line 276 | Line 318 | rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE
318		}
319		return(1);
320		}
321	+	#endif
322
323		/* Read matrix header from input stream (cannot be XML) */
324		int
#	Line 293 | Line 336 | rmx_load_header(RMATRIX *rm, FILE *fp)
336		}
337		rm->dtype = DTascii;                    /* assumed w/o FORMAT */
338		if (getheader(fp, get_dminfo, rm) < 0) {
339	<	fputs("Unrecognized matrix format\n", stderr);
339	>	fputs("Bad matrix header\n", stderr);
340		return(0);
341		}
342		if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
#	Line 366 | Line 409 | rmx_load_data(RMATRIX *rm, FILE *fp)
409
410		/* Load matrix from supported file type */
411		RMATRIX *
412	<	rmx_load(const char *inspec, RMPref rmp)
412	>	rmx_load(const char *inspec)
413		{
414		FILE            *fp;
415		RMATRIX         *dnew;
#	Line 380 | Line 423 | rmx_load(const char *inspec, RMPref rmp)
423		fp = stdin;
424		else if (inspec[0] == '!')
425		fp = popen(inspec+1, "r");
426	<	else {
384	<	const char      *sp = inspec;   /* check suffix */
385	<	while (*sp)
386	<	++sp;
387	<	while (sp > inspec && sp[-1] != '.')
388	<	--sp;
389	<	if (!strcasecmp(sp, "XML")) {   /* assume it's a BSDF */
390	<	CMATRIX *cm = rmp==RMPnone ? (CMATRIX *)NULL :
391	<	rmp==RMPtrans ? cm_loadBTDF(inspec) :
392	<	cm_loadBRDF(inspec, rmp==RMPreflB) ;
393	<	if (!cm)
394	<	return(NULL);
395	<	dnew = rmx_from_cmatrix(cm);
396	<	cm_free(cm);
397	<	dnew->dtype = DTascii;
398	<	return(dnew);           /* return here */
399	<	}                               /* else open it ourselves */
426	>	else
427		fp = fopen(inspec, "r");
401	–	}
428		if (!fp) {
429		fprintf(stderr, "Cannot open for reading: %s\n", inspec);
430		return(NULL);
#	Line 418 | Line 444 | rmx_load(const char *inspec, RMPref rmp)
444
445		if (fp != stdin) {                      /* close input stream */
446		if (inspec[0] == '!')
447	<	pclose(fp);
447	>	ok &= pclose(fp)==0;
448		else
449		fclose(fp);
450		}
#	Line 434 | Line 460 | rmx_load(const char *inspec, RMPref rmp)
460		/* undo exposure? */
461		if ((dnew->cexp[0] != 1.f) |
462		(dnew->cexp[1] != 1.f) | (dnew->cexp[2] != 1.f)) {
463	<	double  cmlt[MAXCSAMP];
463	>	double  cmlt[MAXCOMP];
464		int     i;
465	<	if (dnew->ncomp > MAXCSAMP) {
465	>	if (dnew->ncomp > MAXCOMP) {
466		fprintf(stderr, "Excess spectral components in: %s\n",
467		inspec);
468		rmx_free(dnew);
#	Line 453 | Line 479 | rmx_load(const char *inspec, RMPref rmp)
479		return(dnew);
480		}
481
482	+	#if DTrmx_native==DTdouble
483		static int
484	<	rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
484	>	rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
485		{
486	<	while (len-- > 0) {
487	<	int     k = nc;
488	<	while (k-- > 0)
489	<	fprintf(fp, " %.7e", *dp++);
490	<	fputc('\t', fp);
486	>	float   val;
487	>
488	>	while (len--) {
489	>	val = (float)*dp++;
490	>	if (putbinary(&val, sizeof(val), 1, fp) != 1)
491	>	return(0);
492		}
493	<	return(fputc('\n', fp) != EOF);
493	>	return(1);
494		}
495	<
495	>	#else
496		static int
497	<	rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
497	>	rmx_write_double(const rmx_dtype *dp, int len, FILE *fp)
498		{
499	<	float   val;
499	>	double  val;
500
501		while (len--) {
502		val = *dp++;
503	<	if (putbinary(&val, sizeof(float), 1, fp) != 1)
503	>	if (putbinary(&val, sizeof(val), 1, fp) != 1)
504		return(0);
505		}
506		return(1);
507		}
508	+	#endif
509
510		static int
511	<	rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
511	>	rmx_write_ascii(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
512		{
513	+	while (len-- > 0) {
514	+	int     k = ncomp;
515	+	while (k-- > 0)
516	+	fprintf(fp, " %.7e", *dp++);
517	+	fputc('\t', fp);
518	+	}
519	+	return(fputc('\n', fp) != EOF);
520	+	}
521	+
522	+	static int
523	+	rmx_write_rgbe(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
524	+	{
525		COLR    *scan;
526		int     j;
527
528	<	if ((nc != 1) & (nc != 3)) return(0);
528	>	if ((ncomp != 1) & (ncomp != 3)) return(0);
529		scan = (COLR *)tempbuffer(sizeof(COLR)*len);
530		if (!scan) return(0);
531
532	<	for (j = 0; j < len; j++, dp += nc)
533	<	if (nc == 1)
532	>	for (j = 0; j < len; j++, dp += ncomp)
533	>	if (ncomp == 1)
534		setcolr(scan[j], dp[0], dp[0], dp[0]);
535		else
536		setcolr(scan[j], dp[0], dp[1], dp[2]);
#	Line 497 | Line 538 | rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, F
538		return(fwritecolrs(scan, len, fp) >= 0);
539		}
540
541	+	#if DTrmx_native==DTfloat
542		static int
543	<	rmx_write_spec(const rmx_dtype *dp, int nc, int len, FILE *fp)
543	>	rmx_write_spec(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
544		{
545	<	uby8    *scan;
546	<	SCOLOR  scol;
545	>	COLRV   *scan;
546	>	int     j;
547	>
548	>	if ((ncomp < 3) | (ncomp > MAXCOMP)) return(0);
549	>	scan = (COLRV *)tempbuffer((ncomp+1)*len);
550	>	if (!scan) return(0);
551	>	for (j = 0; j < len; j++, dp += ncomp)
552	>	scolor2scolr(scan+j*(ncomp+1), dp, ncomp);
553	>
554	>	return(fwritescolrs(scan, ncomp, len, fp) >= 0);
555	>	}
556	>	#else
557	>	static int
558	>	rmx_write_spec(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
559	>	{
560	>	COLRV   *scan;
561	>	COLORV  scol[MAXCOMP];
562		int     j, k;
563
564	<	if (nc < 3) return(0);
565	<	scan = (uby8 *)tempbuffer((nc+1)*len);
564	>	if ((ncomp < 3) | (ncomp > MAXCOMP)) return(0);
565	>	scan = (COLRV *)tempbuffer((ncomp+1)*len);
566		if (!scan) return(0);
567	<	for (j = 0; j < len; j++, dp += nc) {
568	<	for (k = nc; k--; )
567	>	for (j = 0; j < len; j++, dp += ncomp) {
568	>	for (k = ncomp; k--; )
569		scol[k] = dp[k];
570	<	scolor2scolr(scan+j*(nc+1), scol, nc);
570	>	scolor2scolr(scan+j*(ncomp+1), scol, ncomp);
571		}
572	<	return(fwritescolrs(scan, nc, len, fp) >= 0);
572	>	return(fwritescolrs(scan, ncomp, len, fp) >= 0);
573		}
574	+	#endif
575
576		/* Check if CIE XYZ primaries were specified */
577		static int
#	Line 540 | Line 598 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
598		return(0);
599		if (rm->info)
600		fputs(rm->info, fp);
601	<	if (dtype == DTfromHeader)
601	>	if (dtype == DTfromHeader) {
602		dtype = rm->dtype;
603	<	else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
603	>	#if DTrmx_native==DTfloat
604	>	if (dtype == DTdouble)          /* but stored as float? */
605	>	dtype = DTfloat;
606	>	#endif
607	>	} else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
608		findCIEprims(rm->info)))
609		dtype = DTxyze;
610		else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
#	Line 586 | Line 648 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
648
649		/* Write out matrix data (usually by row) */
650		int
651	<	rmx_write_data(const rmx_dtype *dp, int nc, int len, int dtype, FILE *fp)
651	>	rmx_write_data(const rmx_dtype *dp, int ncomp, int len, int dtype, FILE *fp)
652		{
653		switch (dtype) {
654	<	case DTascii:
593	<	return(rmx_write_ascii(dp, nc, len, fp));
654	>	#if DTrmx_native==DTdouble
655		case DTfloat:
656	<	return(rmx_write_float(dp, nc*len, fp));
656	>	return(rmx_write_float(dp, ncomp*len, fp));
657	>	#else
658	>	case DTdouble:
659	>	return(rmx_write_double(dp, ncomp*len, fp));
660	>	#endif
661		case DTrmx_native:
662	<	return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
662	>	return(putbinary(dp, sizeof(*dp)*ncomp, len, fp) == len);
663	>	case DTascii:
664	>	return(rmx_write_ascii(dp, ncomp, len, fp));
665		case DTrgbe:
666		case DTxyze:
667	<	return(rmx_write_rgbe(dp, nc, len, fp));
667	>	return(rmx_write_rgbe(dp, ncomp, len, fp));
668		case DTspec:
669	<	return(rmx_write_spec(dp, nc, len, fp));
669	>	return(rmx_write_spec(dp, ncomp, len, fp));
670		}
671		return(0);
672		}
#	Line 682 | Line 749 | rmx_copy(const RMATRIX *rm)
749		int
750		rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
751		{
752	<	if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) |
686	<	(rdst->ncols != rsrc->ncols) |
687	<	(rdst->ncomp != rsrc->ncomp))
752	>	if (!rdst | !rsrc)
753		return(0);
689	–
754		if (dometa) {           /* transfer everything? */
755		rmx_reset(rdst);
756		*rdst = *rsrc;
757		rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
758		return(1);
759		}
760	<	#ifdef MAP_FILE                 /* just matrix data -- leave metadata */
760	>	/* just matrix data -- leave metadata */
761	>	if ((rdst->nrows != rsrc->nrows) |
762	>	(rdst->ncols != rsrc->ncols) |
763	>	(rdst->ncomp != rsrc->ncomp))
764	>	return(0);
765	>	#ifdef MAP_FILE
766		if (rdst->mapped)
767		munmap(rdst->mapped, rmx_mapped_size(rdst));
768		else
769		#endif
770	<	if (rdst->pflags & RMF_FREEMEM)
770	>	if (rdst->pflags & RMF_FREEMEM) {
771		free(rdst->mtx);
772	+	rdst->pflags &= ~RMF_FREEMEM;
773	+	}
774		rdst->mapped = rsrc->mapped;
775		rdst->mtx = rsrc->mtx;
776	<	if (rsrc->pflags & RMF_FREEMEM)
706	<	rdst->pflags |= RMF_FREEMEM;
707	<	else
708	<	rdst->pflags &= ~RMF_FREEMEM;
776	>	rdst->pflags |= rsrc->pflags & RMF_FREEMEM;
777		rsrc->mapped = NULL; rsrc->mtx = NULL;
778		return(1);
779		}
780
781	<	/* Allocate and assign transposed matrix */
782	<	RMATRIX *
783	<	rmx_transpose(const RMATRIX *rm)
781	>	/* Transpose the given matrix */
782	>	int
783	>	rmx_transpose(RMATRIX *rm)
784		{
785	<	RMATRIX *dnew;
786	<	int     i, j;
785	>	uby8            *bmap;
786	>	rmx_dtype       val[MAXCOMP];
787	>	RMATRIX         dold;
788	>	int             i, j;
789
790	<	if (!rm || !rm->mtx)
790	>	if (!rm || !rm->mtx | (rm->ncomp > MAXCOMP))
791		return(0);
792	<	if ((rm->nrows == 1) | (rm->ncols == 1)) {
793	<	dnew = rmx_copy(rm);
794	<	if (!dnew)
795	<	return(NULL);
796	<	dnew->nrows = rm->ncols;
797	<	dnew->ncols = rm->nrows;
798	<	return(dnew);
792	>	if (rm->info)
793	>	rmx_addinfo(rm, "Transposed rows and columns\n");
794	>	if ((rm->nrows == 1) | (rm->ncols == 1)) { /* vector? */
795	>	j = rm->ncols;
796	>	rm->ncols = rm->nrows;
797	>	rm->nrows = j;
798	>	return(1);
799		}
800	<	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
801	<	if (!dnew)
802	<	return(NULL);
803	<	if (rm->info) {
804	<	rmx_addinfo(dnew, rm->info);
805	<	rmx_addinfo(dnew, "Transposed rows and columns\n");
800	>	if (rm->nrows == rm->ncols) {   /* square matrix case */
801	>	for (i = rm->nrows; --i > 0; )
802	>	for (j = i; j-- > 0; ) {
803	>	memcpy(val, rmx_val(rm,i,j),
804	>	sizeof(rmx_dtype)*rm->ncomp);
805	>	memcpy(rmx_lval(rm,i,j), rmx_val(rm,j,i),
806	>	sizeof(rmx_dtype)*rm->ncomp);
807	>	memcpy(rmx_lval(rm,j,i), val,
808	>	sizeof(rmx_dtype)*rm->ncomp);
809	>	}
810	>	return(1);
811		}
812	<	dnew->dtype = rm->dtype;
813	<	copycolor(dnew->cexp, rm->cexp);
814	<	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
815	<	for (j = dnew->ncols; j--; )
816	<	for (i = dnew->nrows; i--; )
817	<	memcpy(rmx_lval(dnew,i,j), rmx_val(rm,j,i),
818	<	sizeof(rmx_dtype)*dnew->ncomp);
819	<	return(dnew);
812	>	#define bmbyte(r,c)     bmap[((r)*rm->ncols+(c))>>3]
813	>	#define bmbit(r,c)      (1 << ((r)*rm->ncols+(c) & 7))
814	>	#define bmop(r,c, op)   (bmbyte(r,c) op bmbit(r,c))
815	>	#define bmtest(r,c)     bmop(r,c,&)
816	>	#define bmset(r,c)      bmop(r,c,|=)
817	>	/* loop completion bitmap */
818	>	bmap = (uby8 *)calloc(((size_t)rm->nrows*rm->ncols+7)>>3, 1);
819	>	if (!bmap)
820	>	return(0);
821	>	dold = *rm;
822	>	rm->ncols = dold.nrows; rm->nrows = dold.ncols;
823	>	for (i = rm->nrows; i--; )      /* try every starting point */
824	>	for (j = rm->ncols; j--; ) {
825	>	int     i0, j0;
826	>	int     i1 = i;
827	>	size_t  j1 = j;
828	>	if (bmtest(i, j))
829	>	continue;       /* traversed loop earlier */
830	>	memcpy(val, rmx_val(rm,i,j),
831	>	sizeof(rmx_dtype)*rm->ncomp);
832	>	for ( ; ; ) {           /* new transpose loop */
833	>	const rmx_dtype     *ds;
834	>	i0 = i1; j0 = j1;
835	>	ds = rmx_val(&dold, j0, i0);
836	>	j1 = (ds - dold.mtx)/dold.ncomp;
837	>	i1 = j1 / rm->ncols;
838	>	j1 -= (size_t)i1*rm->ncols;
839	>	bmset(i1, j1);      /* mark as done */
840	>	if ((i1 == i) & (j1 == j))
841	>	break;          /* back at start */
842	>	memcpy(rmx_lval(rm,i0,j0), ds,
843	>	sizeof(rmx_dtype)*rm->ncomp);
844	>	}                       /* complete the loop */
845	>	memcpy(rmx_lval(rm,i0,j0), val,
846	>	sizeof(rmx_dtype)*rm->ncomp);
847	>	}
848	>	free(bmap);                     /* all done! */
849	>	return(1);
850	>	#undef  bmbyte
851	>	#undef  bmbit
852	>	#undef  bmop
853	>	#undef  bmtest
854	>	#undef  bmset
855		}
856
857		/* Multiply (concatenate) two matrices and allocate the result */
#	Line 765 | Line 875 | rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
875		for (i = mres->nrows; i--; )
876		for (j = mres->ncols; j--; )
877		for (k = mres->ncomp; k--; ) {
878	<	rmx_dtype   d = 0;
878	>	double      d = 0;
879		for (h = m1->ncols; h--; )
880	<	d += rmx_val(m1,i,h)[k] * rmx_val(m2,h,j)[k];
881	<	rmx_lval(mres,i,j)[k] = d;
880	>	d += (double)rmx_val(m1,i,h)[k] *
881	>	rmx_val(m2,h,j)[k];
882	>	rmx_lval(mres,i,j)[k] = (rmx_dtype)d;
883		}
884		return(mres);
885		}
#	Line 860 | Line 971 | rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
971		const rmx_dtype *da = rmx_val(madd,i,j);
972		rmx_dtype       *ds = rmx_lval(msum,i,j);
973		for (k = msum->ncomp; k--; )
974	<	ds[k] += sf[k] * da[k];
974	>	ds[k] += (rmx_dtype)sf[k] * da[k];
975		}
976		if (mysf)
977		free(mysf);
#	Line 879 | Line 990 | rmx_scale(RMATRIX *rm, const double sf[])
990		for (j = rm->ncols; j--; ) {
991		rmx_dtype       *dp = rmx_lval(rm,i,j);
992		for (k = rm->ncomp; k--; )
993	<	dp[k] *= sf[k];
993	>	dp[k] *= (rmx_dtype)sf[k];
994		}
995		if (rm->info)
996		rmx_addinfo(rm, "Applied scalar\n");
#	Line 911 | Line 1022 | rmx_transform(const RMATRIX *msrc, int n, const double
1022		for (j = dnew->ncols; j--; ) {
1023		const rmx_dtype *ds = rmx_val(msrc,i,j);
1024		for (kd = dnew->ncomp; kd--; ) {
1025	<	rmx_dtype   d = 0;
1025	>	double      d = 0;
1026		for (ks = msrc->ncomp; ks--; )
1027		d += cmat[kd*msrc->ncomp + ks] * ds[ks];
1028	<	rmx_lval(dnew,i,j)[kd] = d;
1028	>	rmx_lval(dnew,i,j)[kd] = (rmx_dtype)d;
1029		}
1030		}
1031		return(dnew);
1032		}
1033
923	–	/* Convert a color matrix to newly allocated RMATRIX buffer */
924	–	RMATRIX *
925	–	rmx_from_cmatrix(const CMATRIX *cm)
926	–	{
927	–	int     i, j;
928	–	RMATRIX *dnew;
929	–
930	–	if (!cm)
931	–	return(NULL);
932	–	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
933	–	if (!dnew)
934	–	return(NULL);
935	–	dnew->dtype = DTfloat;
936	–	for (i = dnew->nrows; i--; )
937	–	for (j = dnew->ncols; j--; ) {
938	–	const COLORV    *cv = cm_lval(cm,i,j);
939	–	rmx_dtype       *dp = rmx_lval(dnew,i,j);
940	–	dp[0] = cv[0];
941	–	dp[1] = cv[1];
942	–	dp[2] = cv[2];
943	–	}
944	–	return(dnew);
945	–	}
946	–
947	–	/* Convert general matrix to newly allocated CMATRIX buffer */
948	–	CMATRIX *
949	–	cm_from_rmatrix(const RMATRIX *rm)
950	–	{
951	–	int     i, j;
952	–	CMATRIX *cnew;
953	–
954	–	if (!rm || !rm->mtx | (rm->ncomp == 2))
955	–	return(NULL);
956	–	cnew = cm_alloc(rm->nrows, rm->ncols);
957	–	if (!cnew)
958	–	return(NULL);
959	–	for (i = cnew->nrows; i--; )
960	–	for (j = cnew->ncols; j--; ) {
961	–	const rmx_dtype *dp = rmx_val(rm,i,j);
962	–	COLORV          *cv = cm_lval(cnew,i,j);
963	–	switch (rm->ncomp) {
964	–	case 3:
965	–	setcolor(cv, dp[0], dp[1], dp[2]);
966	–	break;
967	–	case 1:
968	–	setcolor(cv, dp[0], dp[0], dp[0]);
969	–	break;
970	–	default: {
971	–	SCOLOR  scol;
972	–	int     k;
973	–	for (k = rm->ncomp; k--; )
974	–	scol[k] = dp[k];
975	–	scolor2color(cv, scol, rm->ncomp, rm->wlpart);
976	–	} break;
977	–	}
978	–	}
979	–	return(cnew);
980	–	}

Diff Legend

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