24 |
|
if ((nr <= 0) | (nc <= 0) | (n <= 0)) |
25 |
|
return(NULL); |
26 |
|
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
27 |
< |
sizeof(dnew->mtx[0])*(n*nr*nc)); |
27 |
> |
sizeof(dnew->mtx[0])*n*nr*nc); |
28 |
|
if (!dnew) |
29 |
|
return(NULL); |
30 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
163 |
|
{ |
164 |
|
int i; |
165 |
|
|
166 |
< |
if ((char *)&rmx_lval(rm,0,0,0) - (char *)&rmx_lval(rm,1,0,0) != |
166 |
> |
if ((char *)&rmx_lval(rm,1,0,0) - (char *)&rmx_lval(rm,0,0,0) != |
167 |
|
sizeof(double)*rm->ncols*rm->ncomp) { |
168 |
|
fputs("Code error in rmx_load_double()\n", stderr); |
169 |
|
exit(1); |
203 |
|
|
204 |
|
/* Load matrix from supported file type */ |
205 |
|
RMATRIX * |
206 |
< |
rmx_load(const char *inspec) |
206 |
> |
rmx_load(const char *inspec, RMPref rmp) |
207 |
|
{ |
208 |
< |
FILE *fp = stdin; |
208 |
> |
FILE *fp; |
209 |
|
RMATRIX dinfo; |
210 |
|
RMATRIX *dnew; |
211 |
|
|
212 |
< |
if (!inspec) { /* reading from stdin? */ |
213 |
< |
inspec = "<stdin>"; |
214 |
< |
SET_FILE_BINARY(stdin); |
212 |
> |
if (!inspec || !*inspec) |
213 |
> |
return(NULL); |
214 |
> |
if (inspec == stdin_name) { /* reading from stdin? */ |
215 |
> |
fp = stdin; |
216 |
|
} else if (inspec[0] == '!') { |
217 |
|
if (!(fp = popen(inspec+1, "r"))) |
218 |
|
return(NULL); |
218 |
– |
SET_FILE_BINARY(fp); |
219 |
|
} else { |
220 |
|
const char *sp = inspec; /* check suffix */ |
221 |
|
while (*sp) |
223 |
|
while (sp > inspec && sp[-1] != '.') |
224 |
|
--sp; |
225 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
226 |
< |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
226 |
> |
CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) : |
227 |
> |
cm_loadBRDF(inspec, rmp==RMPreflB) ; |
228 |
|
if (!cm) |
229 |
|
return(NULL); |
230 |
|
dnew = rmx_from_cmatrix(cm); |
233 |
|
return(dnew); |
234 |
|
} |
235 |
|
/* else open it ourselves */ |
236 |
< |
if (!(fp = fopen(inspec, "rb"))) |
236 |
> |
if (!(fp = fopen(inspec, "r"))) |
237 |
|
return(NULL); |
238 |
|
} |
239 |
+ |
SET_FILE_BINARY(fp); |
240 |
|
#ifdef getc_unlocked |
241 |
|
flockfile(fp); |
242 |
|
#endif |