| 389 |
|
|
| 390 |
|
/* Load matrix from supported file type */ |
| 391 |
|
RMATRIX * |
| 392 |
< |
rmx_load(const char *inspec, RMPref rmp) |
| 392 |
> |
rmx_load(const char *inspec) |
| 393 |
|
{ |
| 394 |
|
FILE *fp; |
| 395 |
|
RMATRIX *dnew; |
| 403 |
|
fp = stdin; |
| 404 |
|
else if (inspec[0] == '!') |
| 405 |
|
fp = popen(inspec+1, "r"); |
| 406 |
< |
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 */ |
| 406 |
> |
else |
| 407 |
|
fp = fopen(inspec, "r"); |
| 420 |
– |
} |
| 408 |
|
if (!fp) { |
| 409 |
|
fprintf(stderr, "Cannot open for reading: %s\n", inspec); |
| 410 |
|
return(NULL); |
| 778 |
|
#define bmop(r,c, op) (bmbyte(r,c) op bmbit(r,c)) |
| 779 |
|
#define bmtest(r,c) bmop(r,c,&) |
| 780 |
|
#define bmset(r,c) bmop(r,c,|=) |
| 781 |
< |
/* create completion bitmap */ |
| 781 |
> |
/* loop completion bitmap */ |
| 782 |
|
bmap = (uby8 *)calloc(((size_t)rm->nrows*rm->ncols+7)>>3, 1); |
| 783 |
|
if (!bmap) |
| 784 |
|
return(0); |
| 785 |
|
dold = *rm; |
| 786 |
|
rm->ncols = dold.nrows; rm->nrows = dold.ncols; |
| 787 |
< |
for (i = rm->nrows; i--; ) |
| 787 |
> |
for (i = rm->nrows; i--; ) /* try every starting point */ |
| 788 |
|
for (j = rm->ncols; j--; ) { |
| 789 |
|
int i0, j0; |
| 790 |
|
int i1 = i; |
| 791 |
|
size_t j1 = j; |
| 792 |
|
if (bmtest(i, j)) |
| 793 |
< |
continue; |
| 793 |
> |
continue; /* traversed loop earlier */ |
| 794 |
|
memcpy(val, rmx_val(rm,i,j), |
| 795 |
|
sizeof(rmx_dtype)*rm->ncomp); |
| 796 |
< |
bmset(i, j); |
| 810 |
< |
for ( ; ; ) { /* value transpose loop */ |
| 796 |
> |
for ( ; ; ) { /* new transpose loop */ |
| 797 |
|
const rmx_dtype *ds; |
| 798 |
|
i0 = i1; j0 = j1; |
| 799 |
|
ds = rmx_val(&dold, j0, i0); |
| 800 |
|
j1 = (ds - dold.mtx)/dold.ncomp; |
| 801 |
|
i1 = j1 / rm->ncols; |
| 802 |
|
j1 -= (size_t)i1*rm->ncols; |
| 803 |
+ |
bmset(i1, j1); /* mark as done */ |
| 804 |
|
if ((i1 == i) & (j1 == j)) |
| 805 |
< |
break; /* back to start */ |
| 805 |
> |
break; /* back at start */ |
| 806 |
|
memcpy(rmx_lval(rm,i0,j0), ds, |
| 807 |
|
sizeof(rmx_dtype)*rm->ncomp); |
| 821 |
– |
bmset(i1, j1); |
| 808 |
|
} /* complete the loop */ |
| 809 |
|
memcpy(rmx_lval(rm,i0,j0), val, |
| 810 |
|
sizeof(rmx_dtype)*rm->ncomp); |
