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.67 by greg, Fri Dec 1 02:05:00 2023 UTC vs.
Revision 2.102 by greg, Thu Oct 30 16:47:54 2025 UTC

#	Line 18 | Line 18 | static const char RCSid[] = "$Id$";
18
19		static const char       rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
20
21	–	#define array_size(rm)  (sizeof(double)*(rm)->nrows*(rm)->ncols*(rm)->ncomp)
22	–	#define mapped_size(rm) ((char *)(rm)->mtx + array_size(rm) - (char *)(rm)->mapped)
23	–
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));
31	<	if (dnew) {
32	<	dnew->dtype = DTdouble;
33	<	dnew->nrows = nr;
34	<	dnew->ncols = nc;
35	<	dnew->ncomp = n;
36	<	setcolor(dnew->cexp, 1.f, 1.f, 1.f);
37	<	memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart));
38	<	}
31	>	if (!dnew)
32	>	return(NULL);
33	>
34	>	dnew->dtype = DTrmx_native;
35	>	dnew->nrows = nr;
36	>	dnew->ncols = nc;
37	>	dnew->ncomp = ncomp;
38	>	setcolor(dnew->cexp, 1.f, 1.f, 1.f);
39	>	memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart));
40	>
41		return(dnew);
42		}
43
#	Line 47 | 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);
53	<	rm->mtx = (double *)malloc(array_size(rm));
53	>	rm->mtx = (rmx_dtype *)malloc(rmx_array_size(rm));
54	>	rm->pflags |= RMF_FREEMEM;
55		return(rm->mtx != NULL);
56		}
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 77 | Line 77 | rmx_reset(RMATRIX *rm)
77		free(rm->info);
78		rm->info = NULL;
79		}
80	–	if (rm->mtx) {
80		#ifdef MAP_FILE
81	<	if (rm->mapped) {
82	<	munmap(rm->mapped, mapped_size(rm));
83	<	rm->mapped = NULL;
84	<	} else
81	>	if (rm->mapped) {
82	>	munmap(rm->mapped, rmx_mapped_size(rm));
83	>	rm->mapped = NULL;
84	>	} else
85		#endif
86	<	free(rm->mtx);
87	<	rm->mtx = NULL;
86	>	if (rm->pflags & RMF_FREEMEM) {
87	>	free(rm->mtx);
88	>	rm->pflags &= ~RMF_FREEMEM;
89		}
90	+	rm->mtx = NULL;
91		}
92
93		/* Free an RMATRIX struct and data */
#	Line 115 | 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);
124	–	if (rm->info) rm->info[0] = '\0';
125		} else {
126		oldlen = strlen(rm->info);
127		rm->info = (char *)realloc(rm->info,
#	Line 140 | 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	<	ip->swapin = (nativebigendian() != i);
158	>	if (nativebigendian() != i)
159	>	ip->pflags |= RMF_SWAPIN;
160	>	else
161	>	ip->pflags &= ~RMF_SWAPIN;
162		return(0);
163		}
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);
175	<	}
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 182 | 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
191	<	rmx_load_ascii(double *drp, const RMATRIX *rm, FILE *fp)
191	>	rmx_load_ascii(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
192		{
193		int     j, k;
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		}
201
202		static int
203	<	rmx_load_float(double *drp, const RMATRIX *rm, FILE *fp)
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		}
218		for (j = 0; j < rm->ncols; j++) {
219		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
220		return(0);
221	<	if (rm->swapin)
221	>	if (rm->pflags & RMF_SWAPIN)
222		swap32((char *)val, rm->ncomp);
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(double *drp, const RMATRIX *rm, FILE *fp)
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->swapin)
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
258		static int
259	<	rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp)
259	>	rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
260		{
261		COLR    *scan;
262		COLOR   col;
#	Line 251 | Line 278 | rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp
278		return(1);
279		}
280
281	+	#if DTrmx_native==DTfloat
282		static int
283	<	rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp)
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 272 | Line 318 | rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp
318		}
319		return(1);
320		}
321	+	#endif
322
323		/* Read matrix header from input stream (cannot be XML) */
324		int
#	Line 285 | Line 332 | rmx_load_header(RMATRIX *rm, FILE *fp)
332		rm->ncomp = 3;
333		setcolor(rm->cexp, 1.f, 1.f, 1.f);
334		memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart));
335	<	rm->swapin = 0;
335	>	rm->pflags = 0;
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	<	/* resolution string? */
343	<	if ((rm->nrows <= 0) | (rm->ncols <= 0)) {
344	<	if (!fscnresolu(&rm->ncols, &rm->nrows, fp))
345	<	return(0);
346	<	if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
347	<	rm->ncomp != 3)
348	<	return(0);
302	<	}
303	<	if (rm->dtype == DTascii)               /* set input type (WINDOWS) */
342	>	if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
343	>	rm->ncomp != 3)
344	>	return(0);
345	>	if (rm->ncols <= 0 &&                   /* resolution string? */
346	>	!fscnresolu(&rm->ncols, &rm->nrows, fp))
347	>	return(0);
348	>	if (rm->dtype == DTascii)               /* set file type (WINDOWS) */
349		SET_FILE_TEXT(fp);
350		else
351		SET_FILE_BINARY(fp);
352		return(1);
353		}
354
355	<	/* Load next row as double (cannot be XML) */
355	>	/* Load next row as rmx_dtype (cannot be XML) */
356		int
357	<	rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp)
357	>	rmx_load_row(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
358		{
359		switch (rm->dtype) {
360		case DTascii:
#	Line 336 | Line 381 | rmx_load_data(RMATRIX *rm, FILE *fp)
381		int     i;
382		#ifdef MAP_FILE
383		long    pos;            /* map memory for file > 1MB if possible */
384	<	if ((rm->dtype == DTdouble) & !rm->swapin && array_size(rm) >= 1L<<20 &&
385	<	(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) {
386	<	rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE,
384	>	if ((rm->dtype == DTrmx_native) & !(rm->pflags & RMF_SWAPIN) &
385	>	(rmx_array_size(rm) >= 1L<<20) &&
386	>	(pos = ftell(fp)) >= 0 && !(pos % sizeof(rmx_dtype))) {
387	>	rm->mapped = mmap(NULL, rmx_array_size(rm)+pos, PROT_READ|PROT_WRITE,
388		MAP_PRIVATE, fileno(fp), 0);
389		if (rm->mapped != MAP_FAILED) {
390	<	rm->mtx = (double *)rm->mapped + pos/sizeof(double);
390	>	if (rm->pflags & RMF_FREEMEM)
391	>	free(rm->mtx);
392	>	rm->mtx = (rmx_dtype *)rm->mapped + pos/sizeof(rmx_dtype);
393	>	rm->pflags &= ~RMF_FREEMEM;
394		return(1);
395		}               /* else fall back on reading into memory */
396		rm->mapped = NULL;
#	Line 349 | Line 398 | rmx_load_data(RMATRIX *rm, FILE *fp)
398		#endif
399		if (!rmx_prepare(rm)) { /* need in-core matrix array */
400		fprintf(stderr, "Cannot allocate %g MByte matrix array\n",
401	<	(1./(1L<<20))*(double)array_size(rm));
401	>	(1./(1L<<20))*(double)rmx_array_size(rm));
402		return(0);
403		}
404		for (i = 0; i < rm->nrows; i++)
#	Line 360 | 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 374 | 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 if (rmp != RMPnone) {
378	<	const char      *sp = inspec;   /* check suffix */
379	<	while (*sp)
380	<	++sp;
381	<	while (sp > inspec && sp[-1] != '.')
382	<	--sp;
383	<	if (!strcasecmp(sp, "XML")) {   /* assume it's a BSDF */
384	<	CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) :
385	<	cm_loadBRDF(inspec, rmp==RMPreflB) ;
386	<	if (!cm)
387	<	return(NULL);
388	<	dnew = rmx_from_cmatrix(cm);
389	<	cm_free(cm);
390	<	dnew->dtype = DTascii;
391	<	return(dnew);           /* return here */
392	<	}                               /* else open it ourselves */
426	>	else
427		fp = fopen(inspec, "r");
428	<	}
429	<	if (!fp)
428	>	if (!fp) {
429	>	fprintf(stderr, "Cannot open for reading: %s\n", inspec);
430		return(NULL);
431	+	}
432		#ifdef getc_unlocked
433		flockfile(fp);
434		#endif
#	Line 409 | 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 425 | 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	<	cmlt[0] = 1./dnew->cexp[0];
431	<	cmlt[1] = 1./dnew->cexp[1];
432	<	cmlt[2] = 1./dnew->cexp[2];
433	<	if (dnew->ncomp > MAXCSAMP) {
465	>	if (dnew->ncomp > MAXCOMP) {
466		fprintf(stderr, "Excess spectral components in: %s\n",
467		inspec);
468		rmx_free(dnew);
469		return(NULL);
470		}
471	+	cmlt[0] = 1./dnew->cexp[0];
472	+	cmlt[1] = 1./dnew->cexp[1];
473	+	cmlt[2] = 1./dnew->cexp[2];
474		for (i = dnew->ncomp; i-- > 3; )
475	<	cmlt[i] = cmlt[1];
475	>	cmlt[i] = cmlt[1];      /* XXX hack! */
476		rmx_scale(dnew, cmlt);
477		setcolor(dnew->cexp, 1.f, 1.f, 1.f);
478		}
479		return(dnew);
480		}
481
482	+	#if DTrmx_native==DTdouble
483		static int
484	<	rmx_write_ascii(const double *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 (nc-- > 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 double *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 double *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 488 | Line 538 | rmx_write_rgbe(const double *dp, int nc, int len, FILE
538		return(fwritecolrs(scan, len, fp) >= 0);
539		}
540
541	+	#if DTrmx_native==DTfloat
542		static int
543	<	rmx_write_spec(const double *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 = 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 527 | Line 594 | findCIEprims(const char *info)
594		int
595		rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp)
596		{
597	<	if (!rm | !fp || !rm->mtx)
597	>	if (!rm | !fp || rm->ncols <= 0)
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))
611		dtype = DTrgbe;
612	+	if ((dtype < DTspec) & (rm->ncomp > 3))
613	+	dtype = DTspec;
614	+	else if ((dtype == DTspec) & (rm->ncomp <= 3))
615	+	return(0);
616
617	<	if (dtype == DTascii)                   /* set output type (WINDOWS) */
617	>	if (dtype == DTascii)                   /* set file type (WINDOWS) */
618		SET_FILE_TEXT(fp);
619		else
620		SET_FILE_BINARY(fp);
#	Line 549 | Line 624 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
624		fputcolcor(rm->cexp, fp);
625		else if (rm->cexp[GRN] != 1.f)
626		fputexpos(rm->cexp[GRN], fp);
627	<	if ((dtype != DTrgbe) & (dtype != DTxyze)) {
628	<	if (dtype != DTspec) {
627	>	/* matrix size? */
628	>	if ((dtype > DTspec) | (rm->nrows <= 0)) {
629	>	if (rm->nrows > 0)
630		fprintf(fp, "NROWS=%d\n", rm->nrows);
631	<	fprintf(fp, "NCOLS=%d\n", rm->ncols);
632	<	} else if (rm->ncomp < 3)
633	<	return(0);              /* bad # components */
631	>	fprintf(fp, "NCOLS=%d\n", rm->ncols);
632	>	}
633	>	if (dtype >= DTspec) {                  /* # components & split? */
634		fputncomp(rm->ncomp, fp);
635	<	if (dtype == DTspec || (rm->ncomp > 3 &&
636	<	memcmp(rm->wlpart, WLPART, sizeof(WLPART))))
635	>	if (rm->ncomp > 3 &&
636	>	memcmp(rm->wlpart, WLPART, sizeof(WLPART)))
637		fputwlsplit(rm->wlpart, fp);
638		} else if ((rm->ncomp != 3) & (rm->ncomp != 1))
639		return(0);                      /* wrong # components */
#	Line 565 | Line 641 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
641		fputendian(fp);                 /* important to record */
642		fputformat(cm_fmt_id[dtype], fp);
643		fputc('\n', fp);                        /* end of header */
644	<	if (dtype <= DTspec)
644	>	if ((dtype <= DTspec) & (rm->nrows > 0))
645		fprtresolu(rm->ncols, rm->nrows, fp);
646		return(dtype);
647		}
648
649		/* Write out matrix data (usually by row) */
650		int
651	<	rmx_write_data(const double *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:
579	<	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(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
659	>	return(rmx_write_double(dp, ncomp*len, fp));
660	>	#endif
661	>	case DTrmx_native:
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 603 | Line 684 | rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
684		#ifdef getc_unlocked
685		flockfile(fp);
686		#endif
687	<	if (dtype == DTdouble)                  /* write all at once? */
687	>	if (dtype == DTrmx_native)              /* write all at once? */
688		ok = rmx_write_data(rm->mtx, rm->ncomp,
689		rm->nrows*rm->ncols, dtype, fp);
690		else                                    /* else row by row */
#	Line 630 | Line 711 | rmx_identity(const int dim, const int n)
711
712		if (!rid)
713		return(NULL);
714	<	memset(rid->mtx, 0, array_size(rid));
714	>	memset(rid->mtx, 0, rmx_array_size(rid));
715		for (i = dim; i--; ) {
716	<	double      *dp = rmx_lval(rid,i,i);
716	>	rmx_dtype   *dp = rmx_lval(rid,i,i);
717		for (k = n; k--; )
718		dp[k] = 1.;
719		}
720		return(rid);
721		}
722
723	<	/* Duplicate the given matrix */
723	>	/* Duplicate the given matrix (may be unallocated) */
724		RMATRIX *
725		rmx_copy(const RMATRIX *rm)
726		{
727		RMATRIX *dnew;
728
729	<	if (!rm || !rm->mtx)
729	>	if (!rm)
730		return(NULL);
731	<	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
731	>	dnew = rmx_new(rm->nrows, rm->ncols, rm->ncomp);
732		if (!dnew)
733		return(NULL);
734	+	if (rm->mtx) {
735	+	if (!rmx_prepare(dnew)) {
736	+	rmx_free(dnew);
737	+	return(NULL);
738	+	}
739	+	memcpy(dnew->mtx, rm->mtx, rmx_array_size(dnew));
740	+	}
741		rmx_addinfo(dnew, rm->info);
742		dnew->dtype = rm->dtype;
743		copycolor(dnew->cexp, rm->cexp);
744		memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
657	–	memcpy(dnew->mtx, rm->mtx, array_size(dnew));
745		return(dnew);
746		}
747
748	<	/* Allocate and assign transposed matrix */
749	<	RMATRIX *
750	<	rmx_transpose(const RMATRIX *rm)
748	>	/* Replace data in first matrix with data from second */
749	>	int
750	>	rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
751		{
752	<	RMATRIX *dnew;
753	<	int     i, j;
752	>	if (!rdst | !rsrc)
753	>	return(0);
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	>	/* 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) {
771	>	free(rdst->mtx);
772	>	rdst->pflags &= ~RMF_FREEMEM;
773	>	}
774	>	rdst->mapped = rsrc->mapped;
775	>	rdst->mtx = rsrc->mtx;
776	>	rdst->pflags |= rsrc->pflags & RMF_FREEMEM;
777	>	rsrc->mapped = NULL; rsrc->mtx = NULL;
778	>	return(1);
779	>	}
780
781	<	if (!rm || !rm->mtx)
781	>	/* Transpose the given matrix */
782	>	int
783	>	rmx_transpose(RMATRIX *rm)
784	>	{
785	>	uby8            *bmap;
786	>	rmx_dtype       val[MAXCOMP];
787	>	RMATRIX         dold;
788	>	int             i, j;
789	>
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(double)*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 715 | Line 877 | rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
877		for (k = mres->ncomp; k--; ) {
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 741 | Line 904 | rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
904		for (i = m1->nrows; i--; )
905		for (j = m1->ncols; j--; )
906		if (divide) {
907	<	double      d;
907	>	rmx_dtype   d;
908		if (m2->ncomp == 1) {
909		d = rmx_val(m2,i,j)[0];
910		if (d == 0) {
#	Line 764 | Line 927 | rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
927		}
928		} else {
929		if (m2->ncomp == 1) {
930	<	const double    d = rmx_val(m2,i,j)[0];
930	>	const rmx_dtype d = rmx_val(m2,i,j)[0];
931		for (k = m1->ncomp; k--; )
932		rmx_lval(m1,i,j)[k] *= d;
933		} else
#	Line 805 | Line 968 | rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
968		rmx_addinfo(msum, rmx_mismatch_warn);
969		for (i = msum->nrows; i--; )
970		for (j = msum->ncols; j--; ) {
971	<	const double    *da = rmx_val(madd,i,j);
972	<	double          *ds = rmx_lval(msum,i,j);
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 825 | Line 988 | rmx_scale(RMATRIX *rm, const double sf[])
988		return(0);
989		for (i = rm->nrows; i--; )
990		for (j = rm->ncols; j--; ) {
991	<	double  *dp = rmx_lval(rm,i,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 857 | Line 1020 | rmx_transform(const RMATRIX *msrc, int n, const double
1020		dnew->dtype = msrc->dtype;
1021		for (i = dnew->nrows; i--; )
1022		for (j = dnew->ncols; j--; ) {
1023	<	const double    *ds = rmx_val(msrc,i,j);
1023	>	const rmx_dtype *ds = rmx_val(msrc,i,j);
1024		for (kd = dnew->ncomp; kd--; ) {
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
871	–	/* Convert a color matrix to newly allocated RMATRIX buffer */
872	–	RMATRIX *
873	–	rmx_from_cmatrix(const CMATRIX *cm)
874	–	{
875	–	int     i, j;
876	–	RMATRIX *dnew;
877	–
878	–	if (!cm)
879	–	return(NULL);
880	–	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
881	–	if (!dnew)
882	–	return(NULL);
883	–	dnew->dtype = DTfloat;
884	–	for (i = dnew->nrows; i--; )
885	–	for (j = dnew->ncols; j--; ) {
886	–	const COLORV    *cv = cm_lval(cm,i,j);
887	–	double          *dp = rmx_lval(dnew,i,j);
888	–	dp[0] = cv[0];
889	–	dp[1] = cv[1];
890	–	dp[2] = cv[2];
891	–	}
892	–	return(dnew);
893	–	}
894	–
895	–	/* Convert general matrix to newly allocated CMATRIX buffer */
896	–	CMATRIX *
897	–	cm_from_rmatrix(const RMATRIX *rm)
898	–	{
899	–	int     i, j;
900	–	CMATRIX *cnew;
901	–
902	–	if (!rm || !rm->mtx | (rm->ncomp == 2))
903	–	return(NULL);
904	–	cnew = cm_alloc(rm->nrows, rm->ncols);
905	–	if (!cnew)
906	–	return(NULL);
907	–	for (i = cnew->nrows; i--; )
908	–	for (j = cnew->ncols; j--; ) {
909	–	const double    *dp = rmx_val(rm,i,j);
910	–	COLORV          *cv = cm_lval(cnew,i,j);
911	–	switch (rm->ncomp) {
912	–	case 3:
913	–	setcolor(cv, dp[0], dp[1], dp[2]);
914	–	break;
915	–	case 1:
916	–	setcolor(cv, dp[0], dp[0], dp[0]);
917	–	break;
918	–	default: {
919	–	SCOLOR  scol;
920	–	int     k;
921	–	for (k = rm->ncomp; k--; )
922	–	scol[k] = dp[k];
923	–	scolor2color(cv, scol, rm->ncomp, rm->wlpart);
924	–	} break;
925	–	}
926	–	}
927	–	return(cnew);
928	–	}

Diff Legend

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