28 |
|
return(NULL); |
29 |
|
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
30 |
|
sizeof(dnew->mtx[0])*(n*nr*nc)); |
31 |
< |
if (dnew == NULL) |
31 |
> |
if (!dnew) |
32 |
|
return(NULL); |
33 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
34 |
|
dnew->dtype = DTdouble; |
35 |
+ |
dnew->swapin = 0; |
36 |
|
dnew->info = NULL; |
37 |
|
return(dnew); |
38 |
|
} |
64 |
|
int |
65 |
|
rmx_addinfo(RMATRIX *rm, const char *info) |
66 |
|
{ |
67 |
< |
if (!info || !*info) |
67 |
> |
if (!rm || !info || !*info) |
68 |
|
return(0); |
69 |
|
if (!rm->info) { |
70 |
|
rm->info = (char *)malloc(strlen(info)+1); |
99 |
|
ip->ncols = atoi(s+6); |
100 |
|
return(0); |
101 |
|
} |
102 |
+ |
if ((i = isbigendian(s)) >= 0) { |
103 |
+ |
ip->swapin = (nativebigendian() != i); |
104 |
+ |
return(0); |
105 |
+ |
} |
106 |
|
if (!formatval(fmt, s)) { |
107 |
|
rmx_addinfo(ip, s); |
108 |
|
return(0); |
142 |
|
for (j = 0; j < rm->ncols; j++) { |
143 |
|
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
144 |
|
return(0); |
145 |
+ |
if (rm->swapin) |
146 |
+ |
swap32((char *)val, rm->ncomp); |
147 |
|
for (k = rm->ncomp; k--; ) |
148 |
|
rmx_lval(rm,i,j,k) = val[k]; |
149 |
|
} |
156 |
|
int i, j; |
157 |
|
|
158 |
|
for (i = 0; i < rm->nrows; i++) |
159 |
< |
for (j = 0; j < rm->ncols; j++) |
159 |
> |
for (j = 0; j < rm->ncols; j++) { |
160 |
|
if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
161 |
|
return(0); |
162 |
+ |
if (rm->swapin) |
163 |
+ |
swap64((char *)&rmx_lval(rm,i,j,0), rm->ncomp); |
164 |
+ |
} |
165 |
|
return(1); |
166 |
|
} |
167 |
|
|
171 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
172 |
|
int i, j; |
173 |
|
|
174 |
< |
if (scan == NULL) |
174 |
> |
if (!scan) |
175 |
|
return(0); |
176 |
|
for (i = 0; i < rm->nrows; i++) { |
177 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
196 |
|
RMATRIX dinfo; |
197 |
|
RMATRIX *dnew; |
198 |
|
|
199 |
< |
if (inspec == NULL) { /* reading from stdin? */ |
199 |
> |
if (!inspec) { /* reading from stdin? */ |
200 |
|
inspec = "<stdin>"; |
201 |
|
SET_FILE_BINARY(stdin); |
202 |
|
} else if (inspec[0] == '!') { |
203 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
203 |
> |
if (!(fp = popen(inspec+1, "r"))) |
204 |
|
return(NULL); |
205 |
< |
SET_FILE_BINARY(stdin); |
205 |
> |
SET_FILE_BINARY(fp); |
206 |
|
} else { |
207 |
|
const char *sp = inspec; /* check suffix */ |
208 |
|
while (*sp) |
211 |
|
--sp; |
212 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
213 |
|
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
214 |
< |
if (cm == NULL) |
214 |
> |
if (!cm) |
215 |
|
return(NULL); |
216 |
|
dnew = rmx_from_cmatrix(cm); |
217 |
|
cm_free(cm); |
219 |
|
return(dnew); |
220 |
|
} |
221 |
|
/* else open it ourselves */ |
222 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
222 |
> |
if (!(fp = fopen(inspec, "rb"))) |
223 |
|
return(NULL); |
224 |
|
} |
225 |
|
#ifdef getc_unlocked |
227 |
|
#endif |
228 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
229 |
|
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
230 |
+ |
dinfo.swapin = 0; |
231 |
|
dinfo.info = NULL; |
232 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
233 |
|
fclose(fp); |
247 |
|
} |
248 |
|
} |
249 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
250 |
< |
if (dnew == NULL) { |
250 |
> |
if (!dnew) { |
251 |
|
fclose(fp); |
252 |
|
return(NULL); |
253 |
|
} |
254 |
|
dnew->info = dinfo.info; |
255 |
|
switch (dinfo.dtype) { |
256 |
|
case DTascii: |
257 |
< |
SET_FILE_TEXT(stdin); |
257 |
> |
SET_FILE_TEXT(fp); |
258 |
|
if (!rmx_load_ascii(dnew, fp)) |
259 |
|
goto loaderr; |
260 |
|
dnew->dtype = DTascii; /* should leave double? */ |
261 |
|
break; |
262 |
|
case DTfloat: |
263 |
+ |
dnew->swapin = dinfo.swapin; |
264 |
|
if (!rmx_load_float(dnew, fp)) |
265 |
|
goto loaderr; |
266 |
|
dnew->dtype = DTfloat; |
267 |
|
break; |
268 |
|
case DTdouble: |
269 |
+ |
dnew->swapin = dinfo.swapin; |
270 |
|
if (!rmx_load_double(dnew, fp)) |
271 |
|
goto loaderr; |
272 |
|
dnew->dtype = DTdouble; |
357 |
|
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
358 |
|
int i, j; |
359 |
|
|
360 |
< |
if (scan == NULL) |
360 |
> |
if (!scan) |
361 |
|
return(0); |
362 |
|
for (i = 0; i < rm->nrows; i++) { |
363 |
|
for (j = rm->ncols; j--; ) |
380 |
|
RMATRIX *mydm = NULL; |
381 |
|
int ok = 1; |
382 |
|
|
383 |
< |
if ((rm == NULL) | (fp == NULL)) |
383 |
> |
if (!rm | !fp) |
384 |
|
return(0); |
385 |
|
#ifdef getc_unlocked |
386 |
|
flockfile(fp); |
404 |
|
return(0); |
405 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
406 |
|
mydm = rmx_transform(rm, 3, cmtx); |
407 |
< |
if (mydm == NULL) |
407 |
> |
if (!mydm) |
408 |
|
return(0); |
409 |
|
rm = mydm; |
410 |
|
} |
411 |
+ |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
412 |
+ |
fputendian(fp); /* important to record */ |
413 |
|
fputformat((char *)cm_fmt_id[dtype], fp); |
414 |
|
fputc('\n', fp); |
415 |
|
switch (dtype) { /* write data */ |
434 |
|
#ifdef getc_unlocked |
435 |
|
funlockfile(fp); |
436 |
|
#endif |
437 |
< |
rmx_free(mydm); |
437 |
> |
if (mydm) |
438 |
> |
rmx_free(mydm); |
439 |
|
return(ok); |
440 |
|
} |
441 |
|
|
446 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
447 |
|
int i, k; |
448 |
|
|
449 |
< |
if (rid == NULL) |
449 |
> |
if (!rid) |
450 |
|
return(NULL); |
451 |
|
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
452 |
|
for (i = dim; i--; ) |
461 |
|
{ |
462 |
|
RMATRIX *dnew; |
463 |
|
|
464 |
< |
if (rm == NULL) |
464 |
> |
if (!rm) |
465 |
|
return(NULL); |
466 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
467 |
< |
if (dnew == NULL) |
467 |
> |
if (!dnew) |
468 |
|
return(NULL); |
469 |
|
rmx_addinfo(dnew, rm->info); |
470 |
|
dnew->dtype = rm->dtype; |
480 |
|
RMATRIX *dnew; |
481 |
|
int i, j, k; |
482 |
|
|
483 |
< |
if (rm == NULL) |
483 |
> |
if (!rm) |
484 |
|
return(0); |
485 |
|
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
486 |
|
dnew = rmx_copy(rm); |
487 |
< |
if (dnew == NULL) |
487 |
> |
if (!dnew) |
488 |
|
return(NULL); |
489 |
|
dnew->nrows = rm->ncols; |
490 |
|
dnew->ncols = rm->nrows; |
491 |
|
return(dnew); |
492 |
|
} |
493 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
494 |
< |
if (dnew == NULL) |
494 |
> |
if (!dnew) |
495 |
|
return(NULL); |
496 |
|
if (rm->info) { |
497 |
|
rmx_addinfo(dnew, rm->info); |
512 |
|
RMATRIX *mres; |
513 |
|
int i, j, k, h; |
514 |
|
|
515 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
500 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
515 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
516 |
|
return(NULL); |
517 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
518 |
< |
if (mres == NULL) |
518 |
> |
if (!mres) |
519 |
|
return(NULL); |
520 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
521 |
|
if (i) |
540 |
|
int zeroDivides = 0; |
541 |
|
int i, j, k; |
542 |
|
|
543 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
529 |
< |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
543 |
> |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
544 |
|
return(0); |
545 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
546 |
|
return(0); |
583 |
|
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
584 |
|
} |
585 |
|
if (zeroDivides) { |
586 |
< |
fputs("Divide by zero in rmx_elemult()\n", stderr); |
586 |
> |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
587 |
|
errno = ERANGE; |
588 |
|
} |
589 |
|
return(1); |
596 |
|
double *mysf = NULL; |
597 |
|
int i, j, k; |
598 |
|
|
599 |
< |
if ((msum == NULL) | (madd == NULL) || |
599 |
> |
if (!msum | !madd || |
600 |
|
(msum->nrows != madd->nrows) | |
601 |
|
(msum->ncols != madd->ncols) | |
602 |
|
(msum->ncomp != madd->ncomp)) |
603 |
|
return(0); |
604 |
< |
if (sf == NULL) { |
604 |
> |
if (!sf) { |
605 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
606 |
< |
if (mysf == NULL) |
606 |
> |
if (!mysf) |
607 |
|
return(0); |
608 |
|
for (k = msum->ncomp; k--; ) |
609 |
|
mysf[k] = 1; |
618 |
|
for (j = msum->ncols; j--; ) |
619 |
|
for (k = msum->ncomp; k--; ) |
620 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
621 |
< |
|
622 |
< |
free(mysf); |
621 |
> |
if (mysf) |
622 |
> |
free(mysf); |
623 |
|
return(1); |
624 |
|
} |
625 |
|
|
629 |
|
{ |
630 |
|
int i, j, k; |
631 |
|
|
632 |
< |
if ((rm == NULL) | (sf == NULL)) |
632 |
> |
if (!rm | !sf) |
633 |
|
return(0); |
634 |
|
for (i = rm->nrows; i--; ) |
635 |
|
for (j = rm->ncols; j--; ) |
648 |
|
int i, j, ks, kd; |
649 |
|
RMATRIX *dnew; |
650 |
|
|
651 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
651 |
> |
if (!msrc | (n <= 0) | !cmat) |
652 |
|
return(NULL); |
653 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
654 |
< |
if (dnew == NULL) |
654 |
> |
if (!dnew) |
655 |
|
return(NULL); |
656 |
|
if (msrc->info) { |
657 |
|
char buf[128]; |
679 |
|
int i, j; |
680 |
|
RMATRIX *dnew; |
681 |
|
|
682 |
< |
if (cm == NULL) |
682 |
> |
if (!cm) |
683 |
|
return(NULL); |
684 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
685 |
< |
if (dnew == NULL) |
685 |
> |
if (!dnew) |
686 |
|
return(NULL); |
687 |
|
dnew->dtype = DTfloat; |
688 |
|
for (i = dnew->nrows; i--; ) |
702 |
|
int i, j; |
703 |
|
CMATRIX *cnew; |
704 |
|
|
705 |
< |
if (rm == NULL || rm->ncomp != 3) |
705 |
> |
if (!rm || rm->ncomp != 3) |
706 |
|
return(NULL); |
707 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
708 |
< |
if (cnew == NULL) |
708 |
> |
if (!cnew) |
709 |
|
return(NULL); |
710 |
|
for (i = cnew->nrows; i--; ) |
711 |
|
for (j = cnew->ncols; j--; ) { |