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.98 by greg, Sat Apr 19 17:12:59 2025 UTC vs.
Revision 2.103 by greg, Thu Oct 30 17:26:45 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 255 | Line 255 | rmx_load_double(rmx_dtype *drp, const RMATRIX *rm, FIL
255		return(1);
256		}
257
258	+	#if DTrmx_native==DTfloat
259	+	#define rmx_load_spec(dp,rm,fp) (freadsscan(dp,(rm)->ncomp,(rm)->ncols,fp) >= 0)
260	+	#else
261		static int
259	–	rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
260	–	{
261	–	COLR    *scan;
262	–	COLOR   col;
263	–	int     j;
264	–
265	–	if (rm->ncomp != 3)
266	–	return(0);
267	–	scan = (COLR *)tempbuffer(sizeof(COLR)*rm->ncols);
268	–	if (!scan)
269	–	return(0);
270	–	if (freadcolrs(scan, rm->ncols, fp) < 0)
271	–	return(0);
272	–	for (j = 0; j < rm->ncols; j++) {
273	–	colr_color(col, scan[j]);
274	–	*drp++ = colval(col,RED);
275	–	*drp++ = colval(col,GRN);
276	–	*drp++ = colval(col,BLU);
277	–	}
278	–	return(1);
279	–	}
280	–
281	–	static int
262		rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
263		{
264		COLRV   *scan;
#	Line 299 | Line 279 | rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE
279		}
280		return(1);
281		}
282	+	#endif
283
284		/* Read matrix header from input stream (cannot be XML) */
285		int
#	Line 345 | Line 326 | rmx_load_row(rmx_dtype *drp, const RMATRIX *rm, FILE *
326		return(rmx_load_double(drp, rm, fp));
327		case DTrgbe:
328		case DTxyze:
348	–	return(rmx_load_rgbe(drp, rm, fp));
329		case DTspec:
330		return(rmx_load_spec(drp, rm, fp));
331		default:
#	Line 424 | Line 404 | rmx_load(const char *inspec)
404
405		if (fp != stdin) {                      /* close input stream */
406		if (inspec[0] == '!')
407	<	pclose(fp);
407	>	ok &= pclose(fp)==0;
408		else
409		fclose(fp);
410		}
#	Line 488 | Line 468 | rmx_write_double(const rmx_dtype *dp, int len, FILE *f
468		#endif
469
470		static int
471	<	rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
471	>	rmx_write_ascii(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
472		{
473		while (len-- > 0) {
474	<	int     k = nc;
474	>	int     k = ncomp;
475		while (k-- > 0)
476		fprintf(fp, " %.7e", *dp++);
477		fputc('\t', fp);
#	Line 500 | Line 480 | rmx_write_ascii(const rmx_dtype *dp, int nc, int len,
480		}
481
482		static int
483	<	rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
483	>	rmx_write_rgbe(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
484		{
485		COLR    *scan;
486		int     j;
487
488	<	if ((nc != 1) & (nc != 3)) return(0);
488	>	if ((ncomp != 1) & (ncomp != 3)) return(0);
489		scan = (COLR *)tempbuffer(sizeof(COLR)*len);
490		if (!scan) return(0);
491
492	<	for (j = 0; j < len; j++, dp += nc)
493	<	if (nc == 1)
492	>	for (j = 0; j < len; j++, dp += ncomp)
493	>	if (ncomp == 1)
494		setcolr(scan[j], dp[0], dp[0], dp[0]);
495		else
496		setcolr(scan[j], dp[0], dp[1], dp[2]);
#	Line 518 | Line 498 | rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, F
498		return(fwritecolrs(scan, len, fp) >= 0);
499		}
500
501	+	#if DTrmx_native==DTfloat
502	+	#define rmx_write_spec(dp,nc,ln,fp)     (fwritesscan(dp,nc,ln,fp) >= 0)
503	+	#else
504		static int
505	<	rmx_write_spec(const rmx_dtype *dp, int nc, int len, FILE *fp)
505	>	rmx_write_spec(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
506		{
507		COLRV   *scan;
508		COLORV  scol[MAXCOMP];
509		int     j, k;
510
511	<	if ((nc < 3) | (nc > MAXCOMP)) return(0);
512	<	scan = (COLRV *)tempbuffer((nc+1)*len);
511	>	if ((ncomp < 3) | (ncomp > MAXCOMP)) return(0);
512	>	scan = (COLRV *)tempbuffer((ncomp+1)*len);
513		if (!scan) return(0);
514	<	for (j = 0; j < len; j++, dp += nc) {
515	<	for (k = nc; k--; )
514	>	for (j = 0; j < len; j++, dp += ncomp) {
515	>	for (k = ncomp; k--; )
516		scol[k] = dp[k];
517	<	scolor2scolr(scan+j*(nc+1), scol, nc);
517	>	scolor2scolr(scan+j*(ncomp+1), scol, ncomp);
518		}
519	<	return(fwritescolrs(scan, nc, len, fp) >= 0);
519	>	return(fwritescolrs(scan, ncomp, len, fp) >= 0);
520		}
521	+	#endif
522
523		/* Check if CIE XYZ primaries were specified */
524		static int
#	Line 611 | Line 595 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
595
596		/* Write out matrix data (usually by row) */
597		int
598	<	rmx_write_data(const rmx_dtype *dp, int nc, int len, int dtype, FILE *fp)
598	>	rmx_write_data(const rmx_dtype *dp, int ncomp, int len, int dtype, FILE *fp)
599		{
600		switch (dtype) {
601		#if DTrmx_native==DTdouble
602		case DTfloat:
603	<	return(rmx_write_float(dp, nc*len, fp));
603	>	return(rmx_write_float(dp, ncomp*len, fp));
604		#else
605		case DTdouble:
606	<	return(rmx_write_double(dp, nc*len, fp));
606	>	return(rmx_write_double(dp, ncomp*len, fp));
607		#endif
608		case DTrmx_native:
609	<	return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
609	>	return(putbinary(dp, sizeof(*dp)*ncomp, len, fp) == len);
610		case DTascii:
611	<	return(rmx_write_ascii(dp, nc, len, fp));
611	>	return(rmx_write_ascii(dp, ncomp, len, fp));
612		case DTrgbe:
613		case DTxyze:
614	<	return(rmx_write_rgbe(dp, nc, len, fp));
614	>	return(rmx_write_rgbe(dp, ncomp, len, fp));
615		case DTspec:
616	<	return(rmx_write_spec(dp, nc, len, fp));
616	>	return(rmx_write_spec(dp, ncomp, len, fp));
617		}
618		return(0);
619		}
#	Line 761 | Line 745 | rmx_transpose(RMATRIX *rm)
745		return(1);
746		}
747		if (rm->nrows == rm->ncols) {   /* square matrix case */
748	<	for (i = rm->nrows; i--; )
749	<	for (j = rm->ncols; j--; ) {
766	<	if (i == j) continue;
748	>	for (i = rm->nrows; --i > 0; )
749	>	for (j = i; j-- > 0; ) {
750		memcpy(val, rmx_val(rm,i,j),
751		sizeof(rmx_dtype)*rm->ncomp);
752		memcpy(rmx_lval(rm,i,j), rmx_val(rm,j,i),
753		sizeof(rmx_dtype)*rm->ncomp);
754	<	memcpy(rmx_val(rm,j,i), val,
754	>	memcpy(rmx_lval(rm,j,i), val,
755		sizeof(rmx_dtype)*rm->ncomp);
756		}
757	<	return(1);
757	>	return(1);
758		}
759		#define bmbyte(r,c)     bmap[((r)*rm->ncols+(c))>>3]
760		#define bmbit(r,c)      (1 << ((r)*rm->ncols+(c) & 7))

Diff Legend

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