5 |
|
* General matrix operations. |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include <stdio.h> |
8 |
|
#include <stdlib.h> |
9 |
< |
#include <string.h> |
11 |
< |
#include <fcntl.h> |
9 |
> |
#include <errno.h> |
10 |
|
#include "rtio.h" |
11 |
|
#include "platform.h" |
12 |
|
#include "resolu.h" |
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)); |
28 |
< |
if (dnew == NULL) |
27 |
> |
sizeof(dnew->mtx[0])*n*nr*nc); |
28 |
> |
if (!dnew) |
29 |
|
return(NULL); |
30 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
31 |
|
dnew->dtype = DTdouble; |
32 |
+ |
dnew->swapin = 0; |
33 |
|
dnew->info = NULL; |
34 |
|
return(dnew); |
35 |
|
} |
61 |
|
int |
62 |
|
rmx_addinfo(RMATRIX *rm, const char *info) |
63 |
|
{ |
64 |
< |
if (!info || !*info) |
64 |
> |
if (!rm || !info || !*info) |
65 |
|
return(0); |
66 |
|
if (!rm->info) { |
67 |
|
rm->info = (char *)malloc(strlen(info)+1); |
79 |
|
get_dminfo(char *s, void *p) |
80 |
|
{ |
81 |
|
RMATRIX *ip = (RMATRIX *)p; |
82 |
< |
char fmt[64]; |
82 |
> |
char fmt[MAXFMTLEN]; |
83 |
|
int i; |
84 |
|
|
85 |
|
if (headidval(fmt, s)) |
96 |
|
ip->ncols = atoi(s+6); |
97 |
|
return(0); |
98 |
|
} |
99 |
+ |
if ((i = isbigendian(s)) >= 0) { |
100 |
+ |
ip->swapin = (nativebigendian() != i); |
101 |
+ |
return(0); |
102 |
+ |
} |
103 |
+ |
if (isexpos(s)) { |
104 |
+ |
double d = exposval(s); |
105 |
+ |
scalecolor(ip->mtx, d); |
106 |
+ |
return(0); |
107 |
+ |
} |
108 |
+ |
if (iscolcor(s)) { |
109 |
+ |
COLOR ctmp; |
110 |
+ |
colcorval(ctmp, s); |
111 |
+ |
multcolor(ip->mtx, ctmp); |
112 |
+ |
return(0); |
113 |
+ |
} |
114 |
|
if (!formatval(fmt, s)) { |
115 |
|
rmx_addinfo(ip, s); |
116 |
|
return(0); |
150 |
|
for (j = 0; j < rm->ncols; j++) { |
151 |
|
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
152 |
|
return(0); |
153 |
+ |
if (rm->swapin) |
154 |
+ |
swap32((char *)val, rm->ncomp); |
155 |
|
for (k = rm->ncomp; k--; ) |
156 |
|
rmx_lval(rm,i,j,k) = val[k]; |
157 |
|
} |
161 |
|
static int |
162 |
|
rmx_load_double(RMATRIX *rm, FILE *fp) |
163 |
|
{ |
164 |
< |
int i, j, k; |
149 |
< |
double val[100]; |
164 |
> |
int i; |
165 |
|
|
166 |
< |
if (rm->ncomp > 100) { |
167 |
< |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
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); |
170 |
|
} |
171 |
< |
for (i = 0; i < rm->nrows; i++) |
172 |
< |
for (j = 0; j < rm->ncols; j++) { |
173 |
< |
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
174 |
< |
return(0); |
175 |
< |
for (k = rm->ncomp; k--; ) |
176 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
177 |
< |
} |
171 |
> |
for (i = 0; i < rm->nrows; i++) { |
172 |
> |
if (getbinary(&rmx_lval(rm,i,0,0), sizeof(double)*rm->ncomp, |
173 |
> |
rm->ncols, fp) != rm->ncols) |
174 |
> |
return(0); |
175 |
> |
if (rm->swapin) |
176 |
> |
swap64((char *)&rmx_lval(rm,i,0,0), rm->ncols*rm->ncomp); |
177 |
> |
} |
178 |
|
return(1); |
179 |
|
} |
180 |
|
|
184 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
185 |
|
int i, j; |
186 |
|
|
187 |
< |
if (scan == NULL) |
187 |
> |
if (!scan) |
188 |
|
return(0); |
189 |
|
for (i = 0; i < rm->nrows; i++) { |
190 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
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 == NULL) { /* reading from stdin? */ |
213 |
< |
inspec = "<stdin>"; |
214 |
< |
SET_FILE_BINARY(stdin); |
212 |
> |
if (!inspec) |
213 |
> |
inspec = stdin_name; |
214 |
> |
else if (!*inspec) |
215 |
> |
return(NULL); |
216 |
> |
if (inspec == stdin_name) { /* reading from stdin? */ |
217 |
> |
fp = stdin; |
218 |
|
} else if (inspec[0] == '!') { |
219 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
219 |
> |
if (!(fp = popen(inspec+1, "r"))) |
220 |
|
return(NULL); |
202 |
– |
SET_FILE_BINARY(stdin); |
221 |
|
} else { |
222 |
|
const char *sp = inspec; /* check suffix */ |
223 |
|
while (*sp) |
225 |
|
while (sp > inspec && sp[-1] != '.') |
226 |
|
--sp; |
227 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
228 |
< |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
229 |
< |
if (cm == NULL) |
228 |
> |
CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) : |
229 |
> |
cm_loadBRDF(inspec, rmp==RMPreflB) ; |
230 |
> |
if (!cm) |
231 |
|
return(NULL); |
232 |
|
dnew = rmx_from_cmatrix(cm); |
233 |
|
cm_free(cm); |
235 |
|
return(dnew); |
236 |
|
} |
237 |
|
/* else open it ourselves */ |
238 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
238 |
> |
if (!(fp = fopen(inspec, "r"))) |
239 |
|
return(NULL); |
240 |
|
} |
241 |
+ |
SET_FILE_BINARY(fp); |
242 |
|
#ifdef getc_unlocked |
243 |
|
flockfile(fp); |
244 |
|
#endif |
245 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
246 |
|
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
247 |
+ |
dinfo.swapin = 0; |
248 |
|
dinfo.info = NULL; |
249 |
+ |
dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.; |
250 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
251 |
|
fclose(fp); |
252 |
|
return(NULL); |
265 |
|
} |
266 |
|
} |
267 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
268 |
< |
if (dnew == NULL) { |
268 |
> |
if (!dnew) { |
269 |
|
fclose(fp); |
270 |
|
return(NULL); |
271 |
|
} |
272 |
|
dnew->info = dinfo.info; |
273 |
|
switch (dinfo.dtype) { |
274 |
|
case DTascii: |
275 |
< |
SET_FILE_TEXT(stdin); |
275 |
> |
SET_FILE_TEXT(fp); |
276 |
|
if (!rmx_load_ascii(dnew, fp)) |
277 |
|
goto loaderr; |
278 |
|
dnew->dtype = DTascii; /* should leave double? */ |
279 |
|
break; |
280 |
|
case DTfloat: |
281 |
+ |
dnew->swapin = dinfo.swapin; |
282 |
|
if (!rmx_load_float(dnew, fp)) |
283 |
|
goto loaderr; |
284 |
|
dnew->dtype = DTfloat; |
285 |
|
break; |
286 |
|
case DTdouble: |
287 |
+ |
dnew->swapin = dinfo.swapin; |
288 |
|
if (!rmx_load_double(dnew, fp)) |
289 |
|
goto loaderr; |
290 |
|
dnew->dtype = DTdouble; |
293 |
|
case DTxyze: |
294 |
|
if (!rmx_load_rgbe(dnew, fp)) |
295 |
|
goto loaderr; |
296 |
< |
dnew->dtype = dinfo.dtype; |
296 |
> |
dnew->dtype = dinfo.dtype; /* undo exposure? */ |
297 |
> |
if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) | |
298 |
> |
(dinfo.mtx[2] != 1.)) { |
299 |
> |
dinfo.mtx[0] = 1./dinfo.mtx[0]; |
300 |
> |
dinfo.mtx[1] = 1./dinfo.mtx[1]; |
301 |
> |
dinfo.mtx[2] = 1./dinfo.mtx[2]; |
302 |
> |
rmx_scale(dnew, dinfo.mtx); |
303 |
> |
} |
304 |
|
break; |
305 |
|
default: |
306 |
|
goto loaderr; |
328 |
|
static int |
329 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
330 |
|
{ |
331 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
332 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
333 |
+ |
" %.15e" ; |
334 |
|
int i, j, k; |
335 |
|
|
336 |
|
for (i = 0; i < rm->nrows; i++) { |
337 |
|
for (j = 0; j < rm->ncols; j++) { |
338 |
|
for (k = 0; k < rm->ncomp; k++) |
339 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
339 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
340 |
|
fputc('\t', fp); |
341 |
|
} |
342 |
|
fputc('\n', fp); |
367 |
|
static int |
368 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
369 |
|
{ |
370 |
< |
int i, j, k; |
337 |
< |
double val[100]; |
370 |
> |
int i, j; |
371 |
|
|
339 |
– |
if (rm->ncomp > 100) { |
340 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
341 |
– |
exit(1); |
342 |
– |
} |
372 |
|
for (i = 0; i < rm->nrows; i++) |
373 |
< |
for (j = 0; j < rm->ncols; j++) { |
374 |
< |
for (k = rm->ncomp; k--; ) |
346 |
< |
val[k] = rmx_lval(rm,i,j,k); |
347 |
< |
if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
373 |
> |
for (j = 0; j < rm->ncols; j++) |
374 |
> |
if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
375 |
|
return(0); |
349 |
– |
} |
376 |
|
return(1); |
377 |
|
} |
378 |
|
|
379 |
|
static int |
380 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
381 |
|
{ |
382 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
382 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
383 |
|
int i, j; |
384 |
|
|
385 |
< |
if (scan == NULL) |
385 |
> |
if (!scan) |
386 |
|
return(0); |
387 |
|
for (i = 0; i < rm->nrows; i++) { |
388 |
|
for (j = rm->ncols; j--; ) |
389 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
389 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
390 |
|
rmx_lval(rm,i,j,1), |
391 |
|
rmx_lval(rm,i,j,2) ); |
392 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
392 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
393 |
|
free(scan); |
394 |
|
return(0); |
395 |
|
} |
405 |
|
RMATRIX *mydm = NULL; |
406 |
|
int ok = 1; |
407 |
|
|
408 |
< |
if ((rm == NULL) | (fp == NULL)) |
408 |
> |
if (!rm | !fp) |
409 |
|
return(0); |
410 |
|
#ifdef getc_unlocked |
411 |
|
flockfile(fp); |
429 |
|
return(0); |
430 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
431 |
|
mydm = rmx_transform(rm, 3, cmtx); |
432 |
< |
if (mydm == NULL) |
432 |
> |
if (!mydm) |
433 |
|
return(0); |
434 |
|
rm = mydm; |
435 |
|
} |
436 |
+ |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
437 |
+ |
fputendian(fp); /* important to record */ |
438 |
|
fputformat((char *)cm_fmt_id[dtype], fp); |
439 |
|
fputc('\n', fp); |
440 |
|
switch (dtype) { /* write data */ |
459 |
|
#ifdef getc_unlocked |
460 |
|
funlockfile(fp); |
461 |
|
#endif |
462 |
< |
rmx_free(mydm); |
462 |
> |
if (mydm) |
463 |
> |
rmx_free(mydm); |
464 |
|
return(ok); |
465 |
|
} |
466 |
|
|
471 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
472 |
|
int i, k; |
473 |
|
|
474 |
< |
if (rid == NULL) |
474 |
> |
if (!rid) |
475 |
|
return(NULL); |
476 |
|
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
477 |
|
for (i = dim; i--; ) |
486 |
|
{ |
487 |
|
RMATRIX *dnew; |
488 |
|
|
489 |
< |
if (rm == NULL) |
489 |
> |
if (!rm) |
490 |
|
return(NULL); |
491 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
492 |
< |
if (dnew == NULL) |
492 |
> |
if (!dnew) |
493 |
|
return(NULL); |
494 |
|
rmx_addinfo(dnew, rm->info); |
495 |
|
dnew->dtype = rm->dtype; |
505 |
|
RMATRIX *dnew; |
506 |
|
int i, j, k; |
507 |
|
|
508 |
< |
if (rm == NULL) |
508 |
> |
if (!rm) |
509 |
|
return(0); |
510 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
511 |
+ |
dnew = rmx_copy(rm); |
512 |
+ |
if (!dnew) |
513 |
+ |
return(NULL); |
514 |
+ |
dnew->nrows = rm->ncols; |
515 |
+ |
dnew->ncols = rm->nrows; |
516 |
+ |
return(dnew); |
517 |
+ |
} |
518 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
519 |
< |
if (dnew == NULL) |
519 |
> |
if (!dnew) |
520 |
|
return(NULL); |
521 |
|
if (rm->info) { |
522 |
|
rmx_addinfo(dnew, rm->info); |
537 |
|
RMATRIX *mres; |
538 |
|
int i, j, k, h; |
539 |
|
|
540 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
504 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
540 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
541 |
|
return(NULL); |
542 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
543 |
< |
if (mres == NULL) |
543 |
> |
if (!mres) |
544 |
|
return(NULL); |
545 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
546 |
|
if (i) |
558 |
|
return(mres); |
559 |
|
} |
560 |
|
|
561 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
562 |
+ |
int |
563 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
564 |
+ |
{ |
565 |
+ |
int zeroDivides = 0; |
566 |
+ |
int i, j, k; |
567 |
+ |
|
568 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
569 |
+ |
return(0); |
570 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
571 |
+ |
return(0); |
572 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
573 |
+ |
if (i) |
574 |
+ |
m1->dtype = i; |
575 |
+ |
else |
576 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
577 |
+ |
for (i = m1->nrows; i--; ) |
578 |
+ |
for (j = m1->ncols; j--; ) |
579 |
+ |
if (divide) { |
580 |
+ |
double d; |
581 |
+ |
if (m2->ncomp == 1) { |
582 |
+ |
d = rmx_lval(m2,i,j,0); |
583 |
+ |
if (d == 0) { |
584 |
+ |
++zeroDivides; |
585 |
+ |
for (k = m1->ncomp; k--; ) |
586 |
+ |
rmx_lval(m1,i,j,k) = 0; |
587 |
+ |
} else { |
588 |
+ |
d = 1./d; |
589 |
+ |
for (k = m1->ncomp; k--; ) |
590 |
+ |
rmx_lval(m1,i,j,k) *= d; |
591 |
+ |
} |
592 |
+ |
} else |
593 |
+ |
for (k = m1->ncomp; k--; ) { |
594 |
+ |
d = rmx_lval(m2,i,j,k); |
595 |
+ |
if (d == 0) { |
596 |
+ |
++zeroDivides; |
597 |
+ |
rmx_lval(m1,i,j,k) = 0; |
598 |
+ |
} else |
599 |
+ |
rmx_lval(m1,i,j,k) /= d; |
600 |
+ |
} |
601 |
+ |
} else { |
602 |
+ |
if (m2->ncomp == 1) { |
603 |
+ |
const double d = rmx_lval(m2,i,j,0); |
604 |
+ |
for (k = m1->ncomp; k--; ) |
605 |
+ |
rmx_lval(m1,i,j,k) *= d; |
606 |
+ |
} else |
607 |
+ |
for (k = m1->ncomp; k--; ) |
608 |
+ |
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
609 |
+ |
} |
610 |
+ |
if (zeroDivides) { |
611 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
612 |
+ |
errno = ERANGE; |
613 |
+ |
} |
614 |
+ |
return(1); |
615 |
+ |
} |
616 |
+ |
|
617 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
618 |
|
int |
619 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
621 |
|
double *mysf = NULL; |
622 |
|
int i, j, k; |
623 |
|
|
624 |
< |
if ((msum == NULL) | (madd == NULL) || |
624 |
> |
if (!msum | !madd || |
625 |
|
(msum->nrows != madd->nrows) | |
626 |
|
(msum->ncols != madd->ncols) | |
627 |
|
(msum->ncomp != madd->ncomp)) |
628 |
|
return(0); |
629 |
< |
if (sf == NULL) { |
629 |
> |
if (!sf) { |
630 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
631 |
< |
if (mysf == NULL) |
631 |
> |
if (!mysf) |
632 |
|
return(0); |
633 |
|
for (k = msum->ncomp; k--; ) |
634 |
|
mysf[k] = 1; |
643 |
|
for (j = msum->ncols; j--; ) |
644 |
|
for (k = msum->ncomp; k--; ) |
645 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
646 |
< |
|
647 |
< |
free(mysf); |
646 |
> |
if (mysf) |
647 |
> |
free(mysf); |
648 |
|
return(1); |
649 |
|
} |
650 |
|
|
654 |
|
{ |
655 |
|
int i, j, k; |
656 |
|
|
657 |
< |
if ((rm == NULL) | (sf == NULL)) |
657 |
> |
if (!rm | !sf) |
658 |
|
return(0); |
659 |
|
for (i = rm->nrows; i--; ) |
660 |
|
for (j = rm->ncols; j--; ) |
661 |
|
for (k = rm->ncomp; k--; ) |
662 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
663 |
|
|
664 |
+ |
if (rm->info) |
665 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
666 |
|
return(1); |
667 |
|
} |
668 |
|
|
673 |
|
int i, j, ks, kd; |
674 |
|
RMATRIX *dnew; |
675 |
|
|
676 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
676 |
> |
if (!msrc | (n <= 0) | !cmat) |
677 |
|
return(NULL); |
678 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
679 |
< |
if (dnew == NULL) |
679 |
> |
if (!dnew) |
680 |
|
return(NULL); |
681 |
+ |
if (msrc->info) { |
682 |
+ |
char buf[128]; |
683 |
+ |
sprintf(buf, "Applied %dx%d component transform\n", |
684 |
+ |
dnew->ncomp, msrc->ncomp); |
685 |
+ |
rmx_addinfo(dnew, msrc->info); |
686 |
+ |
rmx_addinfo(dnew, buf); |
687 |
+ |
} |
688 |
|
dnew->dtype = msrc->dtype; |
689 |
|
for (i = dnew->nrows; i--; ) |
690 |
|
for (j = dnew->ncols; j--; ) |
704 |
|
int i, j; |
705 |
|
RMATRIX *dnew; |
706 |
|
|
707 |
< |
if (cm == NULL) |
707 |
> |
if (!cm) |
708 |
|
return(NULL); |
709 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
710 |
< |
if (dnew == NULL) |
710 |
> |
if (!dnew) |
711 |
|
return(NULL); |
712 |
|
dnew->dtype = DTfloat; |
713 |
|
for (i = dnew->nrows; i--; ) |
727 |
|
int i, j; |
728 |
|
CMATRIX *cnew; |
729 |
|
|
730 |
< |
if (rm == NULL || rm->ncomp != 3) |
730 |
> |
if (!rm || rm->ncomp != 3) |
731 |
|
return(NULL); |
732 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
733 |
< |
if (cnew == NULL) |
733 |
> |
if (!cnew) |
734 |
|
return(NULL); |
735 |
|
for (i = cnew->nrows; i--; ) |
736 |
|
for (j = cnew->ncols; j--; ) { |