ViewVC Help

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

root/radiance/src/util/rmatrix.c

Comparing src/util/rmatrix.c (file contents):
Revision 2.83 by greg, Tue Oct 8 00:43:57 2024 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 194 | 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 202 | 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 217 | 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	<	return(1);
239	<	}
238	>	#else
239	>	int     j, k;
240	>	double  val[MAXCOMP];
241
242	<	static int
243	<	rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
244	<	{
245	<	COLR    *scan;
237	<	COLOR   col;
238	<	int     j;
239	<
240	<	if (rm->ncomp != 3)
241	<	return(0);
242	<	scan = (COLR *)tempbuffer(sizeof(COLR)*rm->ncols);
243	<	if (!scan)
244	<	return(0);
245	<	if (freadcolrs(scan, rm->ncols, fp) < 0)
246	<	return(0);
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	<	colr_color(col, scan[j]);
248	<	*drp++ = colval(col,RED);
249	<	*drp++ = colval(col,GRN);
250	<	*drp++ = colval(col,BLU);
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
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
262		rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
263		{
264	<	uby8    *scan;
265	<	SCOLOR  scol;
264	>	COLRV   *scan;
265	>	COLORV  scol[MAXCOMP];
266		int     j, k;
267
268	<	if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP))
268	>	if ((rm->ncomp < 3) | (rm->ncomp > MAXCOMP))
269		return(0);
270	<	scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols);
270	>	scan = (COLRV *)tempbuffer((rm->ncomp+1)*rm->ncols);
271		if (!scan)
272		return(0);
273		if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0)
#	Line 274 | 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 320 | 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:
323	–	return(rmx_load_rgbe(drp, rm, fp));
329		case DTspec:
330		return(rmx_load_spec(drp, rm, fp));
331		default:
#	Line 364 | Line 369 | rmx_load_data(RMATRIX *rm, FILE *fp)
369
370		/* Load matrix from supported file type */
371		RMATRIX *
372	<	rmx_load(const char *inspec, RMPref rmp)
372	>	rmx_load(const char *inspec)
373		{
374		FILE            *fp;
375		RMATRIX         *dnew;
#	Line 378 | Line 383 | rmx_load(const char *inspec, RMPref rmp)
383		fp = stdin;
384		else if (inspec[0] == '!')
385		fp = popen(inspec+1, "r");
386	<	else {
382	<	const char      *sp = inspec;   /* check suffix */
383	<	while (*sp)
384	<	++sp;
385	<	while (sp > inspec && sp[-1] != '.')
386	<	--sp;
387	<	if (!strcasecmp(sp, "XML")) {   /* assume it's a BSDF */
388	<	CMATRIX *cm = rmp==RMPnone ? (CMATRIX *)NULL :
389	<	rmp==RMPtrans ? cm_loadBTDF(inspec) :
390	<	cm_loadBRDF(inspec, rmp==RMPreflB) ;
391	<	if (!cm)
392	<	return(NULL);
393	<	dnew = rmx_from_cmatrix(cm);
394	<	cm_free(cm);
395	<	dnew->dtype = DTascii;
396	<	return(dnew);           /* return here */
397	<	}                               /* else open it ourselves */
386	>	else
387		fp = fopen(inspec, "r");
399	–	}
388		if (!fp) {
389		fprintf(stderr, "Cannot open for reading: %s\n", inspec);
390		return(NULL);
#	Line 416 | Line 404 | rmx_load(const char *inspec, RMPref rmp)
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 432 | Line 420 | rmx_load(const char *inspec, RMPref rmp)
420		/* undo exposure? */
421		if ((dnew->cexp[0] != 1.f) |
422		(dnew->cexp[1] != 1.f) | (dnew->cexp[2] != 1.f)) {
423	<	double  cmlt[MAXCSAMP];
423	>	double  cmlt[MAXCOMP];
424		int     i;
425	<	if (dnew->ncomp > MAXCSAMP) {
425	>	if (dnew->ncomp > MAXCOMP) {
426		fprintf(stderr, "Excess spectral components in: %s\n",
427		inspec);
428		rmx_free(dnew);
#	Line 451 | Line 439 | rmx_load(const char *inspec, RMPref rmp)
439		return(dnew);
440		}
441
442	+	#if DTrmx_native==DTdouble
443		static int
444	<	rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
444	>	rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
445		{
446	<	while (len-- > 0) {
447	<	int     k = nc;
448	<	while (k-- > 0)
449	<	fprintf(fp, " %.7e", *dp++);
450	<	fputc('\t', fp);
446	>	float   val;
447	>
448	>	while (len--) {
449	>	val = (float)*dp++;
450	>	if (putbinary(&val, sizeof(val), 1, fp) != 1)
451	>	return(0);
452		}
453	<	return(fputc('\n', fp) != EOF);
453	>	return(1);
454		}
455	<
455	>	#else
456		static int
457	<	rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
457	>	rmx_write_double(const rmx_dtype *dp, int len, FILE *fp)
458		{
459	<	float   val;
459	>	double  val;
460
461		while (len--) {
462		val = *dp++;
463	<	if (putbinary(&val, sizeof(float), 1, fp) != 1)
463	>	if (putbinary(&val, sizeof(val), 1, fp) != 1)
464		return(0);
465		}
466		return(1);
467		}
468	+	#endif
469
470		static int
471	<	rmx_write_rgbe(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 = ncomp;
475	+	while (k-- > 0)
476	+	fprintf(fp, " %.7e", *dp++);
477	+	fputc('\t', fp);
478	+	}
479	+	return(fputc('\n', fp) != EOF);
480	+	}
481	+
482	+	static int
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 495 | 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	<	uby8    *scan;
508	<	SCOLOR  scol;
507	>	COLRV   *scan;
508	>	COLORV  scol[MAXCOMP];
509		int     j, k;
510
511	<	if (nc < 3) return(0);
512	<	scan = (uby8 *)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 538 | Line 545 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
545		return(0);
546		if (rm->info)
547		fputs(rm->info, fp);
548	<	if (dtype == DTfromHeader)
548	>	if (dtype == DTfromHeader) {
549		dtype = rm->dtype;
550	<	else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
550	>	#if DTrmx_native==DTfloat
551	>	if (dtype == DTdouble)          /* but stored as float? */
552	>	dtype = DTfloat;
553	>	#endif
554	>	} else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
555		findCIEprims(rm->info)))
556		dtype = DTxyze;
557		else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
#	Line 584 | 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	<	case DTascii:
591	<	return(rmx_write_ascii(dp, nc, len, fp));
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, 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, 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 680 | Line 696 | rmx_copy(const RMATRIX *rm)
696		int
697		rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
698		{
699	<	if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) |
684	<	(rdst->ncols != rsrc->ncols) |
685	<	(rdst->ncomp != rsrc->ncomp))
699	>	if (!rdst | !rsrc)
700		return(0);
687	–
701		if (dometa) {           /* transfer everything? */
702		rmx_reset(rdst);
703		*rdst = *rsrc;
704		rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
705		return(1);
706		}
707	<	#ifdef MAP_FILE                 /* just matrix data -- leave metadata */
707	>	/* just matrix data -- leave metadata */
708	>	if ((rdst->nrows != rsrc->nrows) |
709	>	(rdst->ncols != rsrc->ncols) |
710	>	(rdst->ncomp != rsrc->ncomp))
711	>	return(0);
712	>	#ifdef MAP_FILE
713		if (rdst->mapped)
714		munmap(rdst->mapped, rmx_mapped_size(rdst));
715		else
#	Line 707 | Line 725 | rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int do
725		return(1);
726		}
727
728	<	/* Allocate and assign transposed matrix */
729	<	RMATRIX *
730	<	rmx_transpose(const RMATRIX *rm)
728	>	/* Transpose the given matrix */
729	>	int
730	>	rmx_transpose(RMATRIX *rm)
731		{
732	<	RMATRIX *dnew;
733	<	int     i, j;
732	>	uby8            *bmap;
733	>	rmx_dtype       val[MAXCOMP];
734	>	RMATRIX         dold;
735	>	int             i, j;
736
737	<	if (!rm || !rm->mtx)
737	>	if (!rm || !rm->mtx | (rm->ncomp > MAXCOMP))
738		return(0);
739	<	if ((rm->nrows == 1) | (rm->ncols == 1)) {
740	<	dnew = rmx_copy(rm);
741	<	if (!dnew)
742	<	return(NULL);
743	<	dnew->nrows = rm->ncols;
744	<	dnew->ncols = rm->nrows;
745	<	return(dnew);
739	>	if (rm->info)
740	>	rmx_addinfo(rm, "Transposed rows and columns\n");
741	>	if ((rm->nrows == 1) | (rm->ncols == 1)) { /* vector? */
742	>	j = rm->ncols;
743	>	rm->ncols = rm->nrows;
744	>	rm->nrows = j;
745	>	return(1);
746		}
747	<	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
748	<	if (!dnew)
749	<	return(NULL);
750	<	if (rm->info) {
751	<	rmx_addinfo(dnew, rm->info);
752	<	rmx_addinfo(dnew, "Transposed rows and columns\n");
747	>	if (rm->nrows == rm->ncols) {   /* square matrix case */
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_lval(rm,j,i), val,
755	>	sizeof(rmx_dtype)*rm->ncomp);
756	>	}
757	>	return(1);
758		}
759	<	dnew->dtype = rm->dtype;
760	<	copycolor(dnew->cexp, rm->cexp);
761	<	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
762	<	for (j = dnew->ncols; j--; )
763	<	for (i = dnew->nrows; i--; )
764	<	memcpy(rmx_lval(dnew,i,j), rmx_val(rm,j,i),
765	<	sizeof(rmx_dtype)*dnew->ncomp);
766	<	return(dnew);
759	>	#define bmbyte(r,c)     bmap[((r)*rm->ncols+(c))>>3]
760	>	#define bmbit(r,c)      (1 << ((r)*rm->ncols+(c) & 7))
761	>	#define bmop(r,c, op)   (bmbyte(r,c) op bmbit(r,c))
762	>	#define bmtest(r,c)     bmop(r,c,&)
763	>	#define bmset(r,c)      bmop(r,c,|=)
764	>	/* loop completion bitmap */
765	>	bmap = (uby8 *)calloc(((size_t)rm->nrows*rm->ncols+7)>>3, 1);
766	>	if (!bmap)
767	>	return(0);
768	>	dold = *rm;
769	>	rm->ncols = dold.nrows; rm->nrows = dold.ncols;
770	>	for (i = rm->nrows; i--; )      /* try every starting point */
771	>	for (j = rm->ncols; j--; ) {
772	>	int     i0, j0;
773	>	int     i1 = i;
774	>	size_t  j1 = j;
775	>	if (bmtest(i, j))
776	>	continue;       /* traversed loop earlier */
777	>	memcpy(val, rmx_val(rm,i,j),
778	>	sizeof(rmx_dtype)*rm->ncomp);
779	>	for ( ; ; ) {           /* new transpose loop */
780	>	const rmx_dtype     *ds;
781	>	i0 = i1; j0 = j1;
782	>	ds = rmx_val(&dold, j0, i0);
783	>	j1 = (ds - dold.mtx)/dold.ncomp;
784	>	i1 = j1 / rm->ncols;
785	>	j1 -= (size_t)i1*rm->ncols;
786	>	bmset(i1, j1);      /* mark as done */
787	>	if ((i1 == i) & (j1 == j))
788	>	break;          /* back at start */
789	>	memcpy(rmx_lval(rm,i0,j0), ds,
790	>	sizeof(rmx_dtype)*rm->ncomp);
791	>	}                       /* complete the loop */
792	>	memcpy(rmx_lval(rm,i0,j0), val,
793	>	sizeof(rmx_dtype)*rm->ncomp);
794	>	}
795	>	free(bmap);                     /* all done! */
796	>	return(1);
797	>	#undef  bmbyte
798	>	#undef  bmbit
799	>	#undef  bmop
800	>	#undef  bmtest
801	>	#undef  bmset
802		}
803
804		/* Multiply (concatenate) two matrices and allocate the result */
#	Line 762 | Line 822 | rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
822		for (i = mres->nrows; i--; )
823		for (j = mres->ncols; j--; )
824		for (k = mres->ncomp; k--; ) {
825	<	rmx_dtype   d = 0;
825	>	double      d = 0;
826		for (h = m1->ncols; h--; )
827	<	d += rmx_val(m1,i,h)[k] * rmx_val(m2,h,j)[k];
828	<	rmx_lval(mres,i,j)[k] = d;
827	>	d += (double)rmx_val(m1,i,h)[k] *
828	>	rmx_val(m2,h,j)[k];
829	>	rmx_lval(mres,i,j)[k] = (rmx_dtype)d;
830		}
831		return(mres);
832		}
#	Line 857 | Line 918 | rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
918		const rmx_dtype *da = rmx_val(madd,i,j);
919		rmx_dtype       *ds = rmx_lval(msum,i,j);
920		for (k = msum->ncomp; k--; )
921	<	ds[k] += sf[k] * da[k];
921	>	ds[k] += (rmx_dtype)sf[k] * da[k];
922		}
923		if (mysf)
924		free(mysf);
#	Line 876 | Line 937 | rmx_scale(RMATRIX *rm, const double sf[])
937		for (j = rm->ncols; j--; ) {
938		rmx_dtype       *dp = rmx_lval(rm,i,j);
939		for (k = rm->ncomp; k--; )
940	<	dp[k] *= sf[k];
940	>	dp[k] *= (rmx_dtype)sf[k];
941		}
942		if (rm->info)
943		rmx_addinfo(rm, "Applied scalar\n");
#	Line 908 | Line 969 | rmx_transform(const RMATRIX *msrc, int n, const double
969		for (j = dnew->ncols; j--; ) {
970		const rmx_dtype *ds = rmx_val(msrc,i,j);
971		for (kd = dnew->ncomp; kd--; ) {
972	<	rmx_dtype   d = 0;
972	>	double      d = 0;
973		for (ks = msrc->ncomp; ks--; )
974		d += cmat[kd*msrc->ncomp + ks] * ds[ks];
975	<	rmx_lval(dnew,i,j)[kd] = d;
975	>	rmx_lval(dnew,i,j)[kd] = (rmx_dtype)d;
976		}
977		}
978		return(dnew);
979		}
980
920	–	/* Convert a color matrix to newly allocated RMATRIX buffer */
921	–	RMATRIX *
922	–	rmx_from_cmatrix(const CMATRIX *cm)
923	–	{
924	–	int     i, j;
925	–	RMATRIX *dnew;
926	–
927	–	if (!cm)
928	–	return(NULL);
929	–	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
930	–	if (!dnew)
931	–	return(NULL);
932	–	dnew->dtype = DTfloat;
933	–	for (i = dnew->nrows; i--; )
934	–	for (j = dnew->ncols; j--; ) {
935	–	const COLORV    *cv = cm_lval(cm,i,j);
936	–	rmx_dtype       *dp = rmx_lval(dnew,i,j);
937	–	dp[0] = cv[0];
938	–	dp[1] = cv[1];
939	–	dp[2] = cv[2];
940	–	}
941	–	return(dnew);
942	–	}
943	–
944	–	/* Convert general matrix to newly allocated CMATRIX buffer */
945	–	CMATRIX *
946	–	cm_from_rmatrix(const RMATRIX *rm)
947	–	{
948	–	int     i, j;
949	–	CMATRIX *cnew;
950	–
951	–	if (!rm || !rm->mtx | (rm->ncomp == 2))
952	–	return(NULL);
953	–	cnew = cm_alloc(rm->nrows, rm->ncols);
954	–	if (!cnew)
955	–	return(NULL);
956	–	for (i = cnew->nrows; i--; )
957	–	for (j = cnew->ncols; j--; ) {
958	–	const rmx_dtype *dp = rmx_val(rm,i,j);
959	–	COLORV          *cv = cm_lval(cnew,i,j);
960	–	switch (rm->ncomp) {
961	–	case 3:
962	–	setcolor(cv, dp[0], dp[1], dp[2]);
963	–	break;
964	–	case 1:
965	–	setcolor(cv, dp[0], dp[0], dp[0]);
966	–	break;
967	–	default: {
968	–	SCOLOR  scol;
969	–	int     k;
970	–	for (k = rm->ncomp; k--; )
971	–	scol[k] = dp[k];
972	–	scolor2color(cv, scol, rm->ncomp, rm->wlpart);
973	–	} break;
974	–	}
975	–	}
976	–	return(cnew);
977	–	}

Diff Legend

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