12 |
|
#include "resolu.h" |
13 |
|
#include "rmatrix.h" |
14 |
|
|
15 |
< |
typedef struct { |
16 |
< |
int nrows, ncols, ncomp; |
17 |
< |
int dtype; |
18 |
< |
} DMINFO; |
15 |
> |
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
16 |
|
|
17 |
|
/* Allocate a nr x nc matrix with n components */ |
18 |
|
RMATRIX * |
27 |
|
if (dnew == NULL) |
28 |
|
return(NULL); |
29 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
30 |
+ |
dnew->dtype = DTdouble; |
31 |
+ |
dnew->info = NULL; |
32 |
|
return(dnew); |
33 |
|
} |
34 |
|
|
35 |
+ |
/* Free a RMATRIX array */ |
36 |
+ |
void |
37 |
+ |
rmx_free(RMATRIX *rm) |
38 |
+ |
{ |
39 |
+ |
if (!rm) return; |
40 |
+ |
if (rm->info) |
41 |
+ |
free(rm->info); |
42 |
+ |
free(rm); |
43 |
+ |
} |
44 |
+ |
|
45 |
+ |
/* Resolve data type based on two input types (returns 0 for mismatch) */ |
46 |
+ |
int |
47 |
+ |
rmx_newtype(int dtyp1, int dtyp2) |
48 |
+ |
{ |
49 |
+ |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2) |
50 |
+ |
return(0); |
51 |
+ |
if (dtyp1 < dtyp2) |
52 |
+ |
return(dtyp1); |
53 |
+ |
return(dtyp2); |
54 |
+ |
} |
55 |
+ |
|
56 |
+ |
/* Append header information associated with matrix data */ |
57 |
+ |
int |
58 |
+ |
rmx_addinfo(RMATRIX *rm, const char *info) |
59 |
+ |
{ |
60 |
+ |
if (!info || !*info) |
61 |
+ |
return(0); |
62 |
+ |
if (!rm->info) { |
63 |
+ |
rm->info = (char *)malloc(strlen(info)+1); |
64 |
+ |
if (rm->info) rm->info[0] = '\0'; |
65 |
+ |
} else |
66 |
+ |
rm->info = (char *)realloc(rm->info, |
67 |
+ |
strlen(rm->info)+strlen(info)+1); |
68 |
+ |
if (!rm->info) |
69 |
+ |
return(0); |
70 |
+ |
strcat(rm->info, info); |
71 |
+ |
return(1); |
72 |
+ |
} |
73 |
+ |
|
74 |
|
static int |
75 |
|
get_dminfo(char *s, void *p) |
76 |
|
{ |
77 |
< |
DMINFO *ip = (DMINFO *)p; |
78 |
< |
char fmt[32]; |
77 |
> |
RMATRIX *ip = (RMATRIX *)p; |
78 |
> |
char fmt[64]; |
79 |
|
int i; |
80 |
|
|
81 |
+ |
if (headidval(fmt, s)) |
82 |
+ |
return(0); |
83 |
|
if (!strncmp(s, "NCOMP=", 6)) { |
84 |
|
ip->ncomp = atoi(s+6); |
85 |
|
return(0); |
92 |
|
ip->ncols = atoi(s+6); |
93 |
|
return(0); |
94 |
|
} |
95 |
< |
if (!formatval(fmt, s)) |
95 |
> |
if (!formatval(fmt, s)) { |
96 |
> |
rmx_addinfo(ip, s); |
97 |
|
return(0); |
98 |
+ |
} |
99 |
|
for (i = 1; i < DTend; i++) |
100 |
|
if (!strcmp(fmt, cm_fmt_id[i])) { |
101 |
|
ip->dtype = i; |
184 |
|
|
185 |
|
/* Load matrix from supported file type */ |
186 |
|
RMATRIX * |
187 |
< |
rmx_load(const char *fname) |
187 |
> |
rmx_load(const char *inspec) |
188 |
|
{ |
189 |
|
FILE *fp = stdin; |
190 |
< |
DMINFO dinfo; |
190 |
> |
RMATRIX dinfo; |
191 |
|
RMATRIX *dnew; |
192 |
|
|
193 |
< |
if (fname == NULL) { /* reading from stdin? */ |
194 |
< |
fname = "<stdin>"; |
193 |
> |
if (inspec == NULL) { /* reading from stdin? */ |
194 |
> |
inspec = "<stdin>"; |
195 |
> |
#ifdef _WIN32 |
196 |
> |
_setmode(fileno(stdin), _O_BINARY); |
197 |
> |
#endif |
198 |
> |
} else if (inspec[0] == '!') { |
199 |
> |
if ((fp = popen(inspec+1, "r")) == NULL) |
200 |
> |
return(NULL); |
201 |
> |
#ifdef _WIN32 |
202 |
> |
_setmode(fileno(fp), _O_BINARY); |
203 |
> |
#endif |
204 |
|
} else { |
205 |
< |
const char *sp = fname; /* check suffix */ |
205 |
> |
const char *sp = inspec; /* check suffix */ |
206 |
|
while (*sp) |
207 |
|
++sp; |
208 |
< |
while (sp > fname && sp[-1] != '.') |
208 |
> |
while (sp > inspec && sp[-1] != '.') |
209 |
|
--sp; |
210 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
211 |
< |
CMATRIX *cm = cm_loadBTDF((char *)fname); |
211 |
> |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
212 |
|
if (cm == NULL) |
213 |
|
return(NULL); |
214 |
|
dnew = rmx_from_cmatrix(cm); |
216 |
|
return(dnew); |
217 |
|
} |
218 |
|
/* else open it ourselves */ |
219 |
< |
if ((fp = fopen(fname, "rb")) == NULL) |
219 |
> |
if ((fp = fopen(inspec, "rb")) == NULL) |
220 |
|
return(NULL); |
221 |
|
} |
222 |
|
#ifdef getc_unlocked |
223 |
|
flockfile(fp); |
224 |
|
#endif |
225 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
226 |
< |
dinfo.dtype = DTascii; |
227 |
< |
if (getheader(fp, &get_dminfo, &dinfo) < 0) { |
226 |
> |
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
227 |
> |
dinfo.info = NULL; |
228 |
> |
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
229 |
|
fclose(fp); |
230 |
|
return(NULL); |
231 |
|
} |
232 |
< |
if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze)) { |
232 |
> |
if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) { |
233 |
|
if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) { |
234 |
|
fclose(fp); |
235 |
|
return(NULL); |
236 |
|
} |
237 |
< |
dinfo.ncomp = 3; |
237 |
> |
if (dinfo.ncomp <= 0) |
238 |
> |
dinfo.ncomp = 3; |
239 |
> |
else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) && |
240 |
> |
dinfo.ncomp != 3) { |
241 |
> |
fclose(fp); |
242 |
> |
return(NULL); |
243 |
> |
} |
244 |
|
} |
245 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
246 |
|
if (dnew == NULL) { |
247 |
|
fclose(fp); |
248 |
|
return(NULL); |
249 |
|
} |
250 |
+ |
dnew->info = dinfo.info; |
251 |
|
switch (dinfo.dtype) { |
252 |
|
case DTascii: |
253 |
|
if (!rmx_load_ascii(dnew, fp)) |
254 |
|
goto loaderr; |
255 |
+ |
dnew->dtype = DTascii; /* should leave double? */ |
256 |
|
break; |
257 |
|
case DTfloat: |
258 |
|
if (!rmx_load_float(dnew, fp)) |
259 |
|
goto loaderr; |
260 |
+ |
dnew->dtype = DTfloat; |
261 |
|
break; |
262 |
|
case DTdouble: |
263 |
|
if (!rmx_load_double(dnew, fp)) |
264 |
|
goto loaderr; |
265 |
+ |
dnew->dtype = DTdouble; |
266 |
|
break; |
267 |
|
case DTrgbe: |
268 |
|
case DTxyze: |
269 |
|
if (!rmx_load_rgbe(dnew, fp)) |
270 |
|
goto loaderr; |
271 |
+ |
dnew->dtype = dinfo.dtype; |
272 |
|
break; |
273 |
|
default: |
274 |
|
goto loaderr; |
275 |
|
} |
276 |
< |
if (fp != stdin) |
277 |
< |
fclose(fp); |
276 |
> |
if (fp != stdin) { |
277 |
> |
if (inspec[0] == '!') |
278 |
> |
pclose(fp); |
279 |
> |
else |
280 |
> |
fclose(fp); |
281 |
> |
} |
282 |
> |
#ifdef getc_unlocked |
283 |
> |
else |
284 |
> |
funlockfile(fp); |
285 |
> |
#endif |
286 |
|
return(dnew); |
287 |
|
loaderr: /* should report error? */ |
288 |
< |
fclose(fp); |
288 |
> |
if (inspec[0] == '!') |
289 |
> |
pclose(fp); |
290 |
> |
else |
291 |
> |
fclose(fp); |
292 |
|
rmx_free(dnew); |
293 |
|
return(NULL); |
294 |
|
} |
373 |
|
return(1); |
374 |
|
} |
375 |
|
|
376 |
< |
/* Write matrix to file type indicated by dt */ |
377 |
< |
long |
376 |
> |
/* Write matrix to file type indicated by dtype */ |
377 |
> |
int |
378 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
379 |
|
{ |
380 |
|
RMATRIX *mydm = NULL; |
383 |
|
if ((rm == NULL) | (fp == NULL)) |
384 |
|
return(0); |
385 |
|
/* complete header */ |
386 |
+ |
if (rm->info) |
387 |
+ |
fputs(rm->info, fp); |
388 |
+ |
if (dtype == DTfromHeader) |
389 |
+ |
dtype = rm->dtype; |
390 |
+ |
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
391 |
+ |
dtype = DTxyze; |
392 |
+ |
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
393 |
+ |
dtype = DTrgbe; |
394 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
395 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
396 |
|
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
427 |
|
} |
428 |
|
ok &= (fflush(fp) == 0); |
429 |
|
rmx_free(mydm); |
430 |
< |
return(ftell(fp) * ok); /* return # bytes written */ |
430 |
> |
return(ok); |
431 |
|
} |
432 |
|
|
433 |
|
/* Allocate and assign square identity matrix with n components */ |
435 |
|
rmx_identity(const int dim, const int n) |
436 |
|
{ |
437 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
438 |
< |
int i; |
438 |
> |
int i, k; |
439 |
|
|
440 |
|
if (rid == NULL) |
441 |
|
return(NULL); |
442 |
< |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim); |
442 |
> |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
443 |
|
for (i = dim; i--; ) |
444 |
< |
rmx_lval(rid,i,i,0) = 1; |
445 |
< |
for (i = n; --i; ) |
364 |
< |
memcpy(rid->mtx+i*(dim*dim), rid->mtx, |
365 |
< |
sizeof(rid->mtx[0])*dim*dim); |
444 |
> |
for (k = n; k--; ) |
445 |
> |
rmx_lval(rid,i,i,k) = 1; |
446 |
|
return(rid); |
447 |
|
} |
448 |
|
|
457 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
458 |
|
if (dnew == NULL) |
459 |
|
return(NULL); |
460 |
+ |
rmx_addinfo(dnew, rm->info); |
461 |
+ |
dnew->dtype = rm->dtype; |
462 |
|
memcpy(dnew->mtx, rm->mtx, |
463 |
|
sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols); |
464 |
|
return(dnew); |
476 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
477 |
|
if (dnew == NULL) |
478 |
|
return(NULL); |
479 |
+ |
if (rm->info) { |
480 |
+ |
rmx_addinfo(dnew, rm->info); |
481 |
+ |
rmx_addinfo(dnew, "Transposed rows and columns\n"); |
482 |
+ |
} |
483 |
+ |
dnew->dtype = rm->dtype; |
484 |
|
for (i = dnew->nrows; i--; ) |
485 |
|
for (j = dnew->ncols; j--; ) |
486 |
|
for (k = dnew->ncomp; k--; ) |
501 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
502 |
|
if (mres == NULL) |
503 |
|
return(NULL); |
504 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
505 |
+ |
if (i) |
506 |
+ |
mres->dtype = i; |
507 |
+ |
else |
508 |
+ |
rmx_addinfo(mres, rmx_mismatch_warn); |
509 |
|
for (i = mres->nrows; i--; ) |
510 |
|
for (j = mres->ncols; j--; ) |
511 |
< |
for (h = m1->ncols; h--; ) { |
511 |
> |
for (k = mres->ncomp; k--; ) { |
512 |
|
long double d = 0; |
513 |
< |
for (k = mres->ncomp; k--; ) |
513 |
> |
for (h = m1->ncols; h--; ) |
514 |
|
d += (long double)rmx_lval(m1,i,h,k) * |
515 |
|
(long double)rmx_lval(m2,h,j,k); |
516 |
|
rmx_lval(mres,i,j,k) = (double)d; |
538 |
|
mysf[k] = 1; |
539 |
|
sf = mysf; |
540 |
|
} |
541 |
+ |
i = rmx_newtype(msum->dtype, madd->dtype); |
542 |
+ |
if (i) |
543 |
+ |
msum->dtype = i; |
544 |
+ |
else |
545 |
+ |
rmx_addinfo(msum, rmx_mismatch_warn); |
546 |
|
for (i = msum->nrows; i--; ) |
547 |
|
for (j = msum->ncols; j--; ) |
548 |
|
for (k = msum->ncomp; k--; ) |
580 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
581 |
|
if (dnew == NULL) |
582 |
|
return(NULL); |
583 |
+ |
dnew->dtype = msrc->dtype; |
584 |
|
for (i = dnew->nrows; i--; ) |
585 |
|
for (j = dnew->ncols; j--; ) |
586 |
|
for (kd = dnew->ncomp; kd--; ) { |
604 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
605 |
|
if (dnew == NULL) |
606 |
|
return(NULL); |
607 |
+ |
dnew->dtype = DTfloat; |
608 |
|
for (i = dnew->nrows; i--; ) |
609 |
|
for (j = dnew->ncols; j--; ) { |
610 |
|
const COLORV *cv = cm_lval(cm,i,j); |