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.96 by greg, Thu Apr 17 23:30:16 2025 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 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 (!rmx_prepare(dnew)) {
65		rmx_free(dnew);
#	Line 278 | 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		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
#	Line 299 | 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 389 | 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 403 | 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 {                                  /* check suffix */
407	<	const char      *sp = strrchr(inspec, '.');
408	<	if (sp > inspec && !strcasecmp(sp+1, "XML")) {  /* BSDF? */
409	<	CMATRIX *cm = rmp==RMPnone ? (CMATRIX *)NULL :
410	<	rmp==RMPtrans ? cm_loadBTDF(inspec) :
411	<	cm_loadBRDF(inspec, rmp==RMPreflB) ;
412	<	if (!cm)
413	<	return(NULL);
414	<	dnew = rmx_from_cmatrix(cm);
415	<	cm_free(cm);
416	<	dnew->dtype = DTascii;
417	<	return(dnew);           /* return here */
418	<	}                               /* else open it ourselves */
426	>	else
427		fp = fopen(inspec, "r");
420	–	}
428		if (!fp) {
429		fprintf(stderr, "Cannot open for reading: %s\n", inspec);
430		return(NULL);
#	Line 437 | 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 501 | Line 508 | rmx_write_double(const rmx_dtype *dp, int len, FILE *f
508		#endif
509
510		static int
511	<	rmx_write_ascii(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 = nc;
514	>	int     k = ncomp;
515		while (k-- > 0)
516		fprintf(fp, " %.7e", *dp++);
517		fputc('\t', fp);
#	Line 513 | Line 520 | rmx_write_ascii(const rmx_dtype *dp, int nc, int len,
520		}
521
522		static int
523	<	rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
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 531 | 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		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) | (nc > MAXCOMP)) return(0);
565	<	scan = (COLRV *)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 624 | 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		#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, nc*len, fp));
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, nc, len, fp));
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 774 | Line 798 | rmx_transpose(RMATRIX *rm)
798		return(1);
799		}
800		if (rm->nrows == rm->ncols) {   /* square matrix case */
801	<	for (i = rm->nrows; i--; )
802	<	for (j = rm->ncols; j--; ) {
779	<	if (i == j) continue;
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_val(rm,j,i), val,
807	>	memcpy(rmx_lval(rm,j,i), val,
808		sizeof(rmx_dtype)*rm->ncomp);
809		}
810	<	return(1);
810	>	return(1);
811		}
812		#define bmbyte(r,c)     bmap[((r)*rm->ncols+(c))>>3]
813		#define bmbit(r,c)      (1 << ((r)*rm->ncols+(c) & 7))
#	Line 1008 | Line 1031 | rmx_transform(const RMATRIX *msrc, int n, const double
1031		return(dnew);
1032		}
1033
1011	–	/* Convert a color matrix to newly allocated RMATRIX buffer */
1012	–	RMATRIX *
1013	–	rmx_from_cmatrix(const CMATRIX *cm)
1014	–	{
1015	–	RMATRIX *dnew;
1016	–
1017	–	if (!cm)
1018	–	return(NULL);
1019	–	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
1020	–	if (!dnew)
1021	–	return(NULL);
1022	–
1023	–	dnew->dtype = sizeof(COLORV)==sizeof(float) ?
1024	–	DTfloat : DTdouble;
1025	–
1026	–	if (sizeof(COLORV) == sizeof(rmx_dtype)) {
1027	–	memcpy(dnew->mtx, cm->cmem, rmx_array_size(dnew));
1028	–	} else {
1029	–	int     i, j;
1030	–	for (i = dnew->nrows; i--; )
1031	–	for (j = dnew->ncols; j--; ) {
1032	–	const COLORV    *cv = cm_lval(cm,i,j);
1033	–	rmx_dtype       *dp = rmx_lval(dnew,i,j);
1034	–	dp[0] = cv[0];
1035	–	dp[1] = cv[1];
1036	–	dp[2] = cv[2];
1037	–	}
1038	–	}
1039	–	return(dnew);
1040	–	}
1041	–
1042	–	/* Convert general matrix to newly allocated CMATRIX buffer */
1043	–	CMATRIX *
1044	–	cm_from_rmatrix(const RMATRIX *rm)
1045	–	{
1046	–	CMATRIX *cnew;
1047	–
1048	–	if (!rm || !rm->mtx | (rm->ncomp == 2) | (rm->ncomp > MAXCOMP))
1049	–	return(NULL);
1050	–	cnew = cm_alloc(rm->nrows, rm->ncols);
1051	–	if (!cnew)
1052	–	return(NULL);
1053	–	if ((sizeof(COLORV) == sizeof(rmx_dtype)) & (rm->ncomp == 3)) {
1054	–	memcpy(cnew->cmem, rm->mtx, rmx_array_size(rm));
1055	–	} else {
1056	–	int     i, j;
1057	–	for (i = cnew->nrows; i--; )
1058	–	for (j = cnew->ncols; j--; ) {
1059	–	const rmx_dtype *dp = rmx_val(rm,i,j);
1060	–	COLORV          *cv = cm_lval(cnew,i,j);
1061	–	switch (rm->ncomp) {
1062	–	case 3:
1063	–	setcolor(cv, dp[0], dp[1], dp[2]);
1064	–	break;
1065	–	case 1:
1066	–	setcolor(cv, dp[0], dp[0], dp[0]);
1067	–	break;
1068	–	default:
1069	–	if (sizeof(COLORV) == sizeof(rmx_dtype)) {
1070	–	scolor2color(cv, (const COLORV *)dp,
1071	–	rm->ncomp, rm->wlpart);
1072	–	} else {
1073	–	COLORV  scol[MAXCOMP];
1074	–	int     k = rm->ncomp;
1075	–	while (k--) scol[k] = dp[k];
1076	–	scolor2color(cv, scol, rm->ncomp, rm->wlpart);
1077	–	}
1078	–	break;
1079	–	}
1080	–	}
1081	–	}
1082	–	return(cnew);
1083	–	}

Diff Legend

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