5 |
|
* General matrix operations. |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include <stdio.h> |
8 |
|
#include <stdlib.h> |
9 |
< |
#include <string.h> |
10 |
< |
#include <fcntl.h> |
9 |
> |
#include <errno.h> |
10 |
> |
#include "rtio.h" |
11 |
> |
#include "platform.h" |
12 |
|
#include "resolu.h" |
13 |
|
#include "paths.h" |
14 |
|
#include "rmatrix.h" |
25 |
|
return(NULL); |
26 |
|
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
27 |
|
sizeof(dnew->mtx[0])*(n*nr*nc)); |
28 |
< |
if (dnew == NULL) |
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); |
148 |
|
} |
149 |
|
for (i = 0; i < rm->nrows; i++) |
150 |
|
for (j = 0; j < rm->ncols; j++) { |
151 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
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; |
147 |
< |
double val[100]; |
164 |
> |
int i; |
165 |
|
|
166 |
< |
if (rm->ncomp > 100) { |
167 |
< |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
166 |
> |
if (&rmx_lval(rm,0,0,0) - &rmx_lval(rm,1,0,0) != rm->ncols*rm->ncomp) { |
167 |
> |
fputs("Code error in rmx_load_double()\n", stderr); |
168 |
|
exit(1); |
169 |
|
} |
170 |
< |
for (i = 0; i < rm->nrows; i++) |
171 |
< |
for (j = 0; j < rm->ncols; j++) { |
172 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
173 |
< |
return(0); |
174 |
< |
for (k = rm->ncomp; k--; ) |
175 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
176 |
< |
} |
170 |
> |
for (i = 0; i < rm->nrows; i++) { |
171 |
> |
if (getbinary(&rmx_lval(rm,i,0,0), sizeof(double)*rm->ncomp, |
172 |
> |
rm->ncols, fp) != rm->ncols) |
173 |
> |
return(0); |
174 |
> |
if (rm->swapin) |
175 |
> |
swap64((char *)&rmx_lval(rm,i,0,0), rm->ncols*rm->ncomp); |
176 |
> |
} |
177 |
|
return(1); |
178 |
|
} |
179 |
|
|
183 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
184 |
|
int i, j; |
185 |
|
|
186 |
< |
if (scan == NULL) |
186 |
> |
if (!scan) |
187 |
|
return(0); |
188 |
|
for (i = 0; i < rm->nrows; i++) { |
189 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
208 |
|
RMATRIX dinfo; |
209 |
|
RMATRIX *dnew; |
210 |
|
|
211 |
< |
if (inspec == NULL) { /* reading from stdin? */ |
211 |
> |
if (!inspec) { /* reading from stdin? */ |
212 |
|
inspec = "<stdin>"; |
213 |
< |
#ifdef _WIN32 |
197 |
< |
_setmode(fileno(stdin), _O_BINARY); |
198 |
< |
#endif |
213 |
> |
SET_FILE_BINARY(stdin); |
214 |
|
} else if (inspec[0] == '!') { |
215 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
215 |
> |
if (!(fp = popen(inspec+1, "r"))) |
216 |
|
return(NULL); |
217 |
< |
#ifdef _WIN32 |
203 |
< |
_setmode(fileno(fp), _O_BINARY); |
204 |
< |
#endif |
217 |
> |
SET_FILE_BINARY(fp); |
218 |
|
} else { |
219 |
|
const char *sp = inspec; /* check suffix */ |
220 |
|
while (*sp) |
223 |
|
--sp; |
224 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
225 |
|
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
226 |
< |
if (cm == NULL) |
226 |
> |
if (!cm) |
227 |
|
return(NULL); |
228 |
|
dnew = rmx_from_cmatrix(cm); |
229 |
|
cm_free(cm); |
231 |
|
return(dnew); |
232 |
|
} |
233 |
|
/* else open it ourselves */ |
234 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
234 |
> |
if (!(fp = fopen(inspec, "rb"))) |
235 |
|
return(NULL); |
236 |
|
} |
237 |
|
#ifdef getc_unlocked |
239 |
|
#endif |
240 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
241 |
|
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
242 |
+ |
dinfo.swapin = 0; |
243 |
|
dinfo.info = NULL; |
244 |
+ |
dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.; |
245 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
246 |
|
fclose(fp); |
247 |
|
return(NULL); |
260 |
|
} |
261 |
|
} |
262 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
263 |
< |
if (dnew == NULL) { |
263 |
> |
if (!dnew) { |
264 |
|
fclose(fp); |
265 |
|
return(NULL); |
266 |
|
} |
267 |
|
dnew->info = dinfo.info; |
268 |
|
switch (dinfo.dtype) { |
269 |
|
case DTascii: |
270 |
< |
#ifdef _WIN32 |
256 |
< |
_setmode(fileno(fp), _O_TEXT); |
257 |
< |
#endif |
270 |
> |
SET_FILE_TEXT(fp); |
271 |
|
if (!rmx_load_ascii(dnew, fp)) |
272 |
|
goto loaderr; |
273 |
|
dnew->dtype = DTascii; /* should leave double? */ |
274 |
|
break; |
275 |
|
case DTfloat: |
276 |
+ |
dnew->swapin = dinfo.swapin; |
277 |
|
if (!rmx_load_float(dnew, fp)) |
278 |
|
goto loaderr; |
279 |
|
dnew->dtype = DTfloat; |
280 |
|
break; |
281 |
|
case DTdouble: |
282 |
+ |
dnew->swapin = dinfo.swapin; |
283 |
|
if (!rmx_load_double(dnew, fp)) |
284 |
|
goto loaderr; |
285 |
|
dnew->dtype = DTdouble; |
288 |
|
case DTxyze: |
289 |
|
if (!rmx_load_rgbe(dnew, fp)) |
290 |
|
goto loaderr; |
291 |
< |
dnew->dtype = dinfo.dtype; |
291 |
> |
dnew->dtype = dinfo.dtype; /* undo exposure? */ |
292 |
> |
if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) | |
293 |
> |
(dinfo.mtx[2] != 1.)) { |
294 |
> |
dinfo.mtx[0] = 1./dinfo.mtx[0]; |
295 |
> |
dinfo.mtx[1] = 1./dinfo.mtx[1]; |
296 |
> |
dinfo.mtx[2] = 1./dinfo.mtx[2]; |
297 |
> |
rmx_scale(dnew, dinfo.mtx); |
298 |
> |
} |
299 |
|
break; |
300 |
|
default: |
301 |
|
goto loaderr; |
323 |
|
static int |
324 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
325 |
|
{ |
326 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
327 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
328 |
+ |
" %.15e" ; |
329 |
|
int i, j, k; |
330 |
|
|
331 |
|
for (i = 0; i < rm->nrows; i++) { |
332 |
|
for (j = 0; j < rm->ncols; j++) { |
333 |
|
for (k = 0; k < rm->ncomp; k++) |
334 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
334 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
335 |
|
fputc('\t', fp); |
336 |
|
} |
337 |
|
fputc('\n', fp); |
353 |
|
for (j = 0; j < rm->ncols; j++) { |
354 |
|
for (k = rm->ncomp; k--; ) |
355 |
|
val[k] = (float)rmx_lval(rm,i,j,k); |
356 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
356 |
> |
if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
357 |
|
return(0); |
358 |
|
} |
359 |
|
return(1); |
362 |
|
static int |
363 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
364 |
|
{ |
365 |
< |
int i, j, k; |
341 |
< |
double val[100]; |
365 |
> |
int i, j; |
366 |
|
|
343 |
– |
if (rm->ncomp > 100) { |
344 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
345 |
– |
exit(1); |
346 |
– |
} |
367 |
|
for (i = 0; i < rm->nrows; i++) |
368 |
< |
for (j = 0; j < rm->ncols; j++) { |
369 |
< |
for (k = rm->ncomp; k--; ) |
350 |
< |
val[k] = rmx_lval(rm,i,j,k); |
351 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
368 |
> |
for (j = 0; j < rm->ncols; j++) |
369 |
> |
if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
370 |
|
return(0); |
353 |
– |
} |
371 |
|
return(1); |
372 |
|
} |
373 |
|
|
374 |
|
static int |
375 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
376 |
|
{ |
377 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
377 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
378 |
|
int i, j; |
379 |
|
|
380 |
< |
if (scan == NULL) |
380 |
> |
if (!scan) |
381 |
|
return(0); |
382 |
|
for (i = 0; i < rm->nrows; i++) { |
383 |
|
for (j = rm->ncols; j--; ) |
384 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
384 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
385 |
|
rmx_lval(rm,i,j,1), |
386 |
|
rmx_lval(rm,i,j,2) ); |
387 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
387 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
388 |
|
free(scan); |
389 |
|
return(0); |
390 |
|
} |
400 |
|
RMATRIX *mydm = NULL; |
401 |
|
int ok = 1; |
402 |
|
|
403 |
< |
if ((rm == NULL) | (fp == NULL)) |
403 |
> |
if (!rm | !fp) |
404 |
|
return(0); |
405 |
|
#ifdef getc_unlocked |
406 |
|
flockfile(fp); |
424 |
|
return(0); |
425 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
426 |
|
mydm = rmx_transform(rm, 3, cmtx); |
427 |
< |
if (mydm == NULL) |
427 |
> |
if (!mydm) |
428 |
|
return(0); |
429 |
|
rm = mydm; |
430 |
|
} |
431 |
+ |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
432 |
+ |
fputendian(fp); /* important to record */ |
433 |
|
fputformat((char *)cm_fmt_id[dtype], fp); |
434 |
|
fputc('\n', fp); |
435 |
|
switch (dtype) { /* write data */ |
454 |
|
#ifdef getc_unlocked |
455 |
|
funlockfile(fp); |
456 |
|
#endif |
457 |
< |
rmx_free(mydm); |
457 |
> |
if (mydm) |
458 |
> |
rmx_free(mydm); |
459 |
|
return(ok); |
460 |
|
} |
461 |
|
|
466 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
467 |
|
int i, k; |
468 |
|
|
469 |
< |
if (rid == NULL) |
469 |
> |
if (!rid) |
470 |
|
return(NULL); |
471 |
|
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
472 |
|
for (i = dim; i--; ) |
481 |
|
{ |
482 |
|
RMATRIX *dnew; |
483 |
|
|
484 |
< |
if (rm == NULL) |
484 |
> |
if (!rm) |
485 |
|
return(NULL); |
486 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
487 |
< |
if (dnew == NULL) |
487 |
> |
if (!dnew) |
488 |
|
return(NULL); |
489 |
|
rmx_addinfo(dnew, rm->info); |
490 |
|
dnew->dtype = rm->dtype; |
500 |
|
RMATRIX *dnew; |
501 |
|
int i, j, k; |
502 |
|
|
503 |
< |
if (rm == NULL) |
503 |
> |
if (!rm) |
504 |
|
return(0); |
505 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
506 |
+ |
dnew = rmx_copy(rm); |
507 |
+ |
if (!dnew) |
508 |
+ |
return(NULL); |
509 |
+ |
dnew->nrows = rm->ncols; |
510 |
+ |
dnew->ncols = rm->nrows; |
511 |
+ |
return(dnew); |
512 |
+ |
} |
513 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
514 |
< |
if (dnew == NULL) |
514 |
> |
if (!dnew) |
515 |
|
return(NULL); |
516 |
|
if (rm->info) { |
517 |
|
rmx_addinfo(dnew, rm->info); |
532 |
|
RMATRIX *mres; |
533 |
|
int i, j, k, h; |
534 |
|
|
535 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
508 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
535 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
536 |
|
return(NULL); |
537 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
538 |
< |
if (mres == NULL) |
538 |
> |
if (!mres) |
539 |
|
return(NULL); |
540 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
541 |
|
if (i) |
553 |
|
return(mres); |
554 |
|
} |
555 |
|
|
556 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
557 |
+ |
int |
558 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
559 |
+ |
{ |
560 |
+ |
int zeroDivides = 0; |
561 |
+ |
int i, j, k; |
562 |
+ |
|
563 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
564 |
+ |
return(0); |
565 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
566 |
+ |
return(0); |
567 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
568 |
+ |
if (i) |
569 |
+ |
m1->dtype = i; |
570 |
+ |
else |
571 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
572 |
+ |
for (i = m1->nrows; i--; ) |
573 |
+ |
for (j = m1->ncols; j--; ) |
574 |
+ |
if (divide) { |
575 |
+ |
double d; |
576 |
+ |
if (m2->ncomp == 1) { |
577 |
+ |
d = rmx_lval(m2,i,j,0); |
578 |
+ |
if (d == 0) { |
579 |
+ |
++zeroDivides; |
580 |
+ |
for (k = m1->ncomp; k--; ) |
581 |
+ |
rmx_lval(m1,i,j,k) = 0; |
582 |
+ |
} else { |
583 |
+ |
d = 1./d; |
584 |
+ |
for (k = m1->ncomp; k--; ) |
585 |
+ |
rmx_lval(m1,i,j,k) *= d; |
586 |
+ |
} |
587 |
+ |
} else |
588 |
+ |
for (k = m1->ncomp; k--; ) { |
589 |
+ |
d = rmx_lval(m2,i,j,k); |
590 |
+ |
if (d == 0) { |
591 |
+ |
++zeroDivides; |
592 |
+ |
rmx_lval(m1,i,j,k) = 0; |
593 |
+ |
} else |
594 |
+ |
rmx_lval(m1,i,j,k) /= d; |
595 |
+ |
} |
596 |
+ |
} else { |
597 |
+ |
if (m2->ncomp == 1) { |
598 |
+ |
const double d = rmx_lval(m2,i,j,0); |
599 |
+ |
for (k = m1->ncomp; k--; ) |
600 |
+ |
rmx_lval(m1,i,j,k) *= d; |
601 |
+ |
} else |
602 |
+ |
for (k = m1->ncomp; k--; ) |
603 |
+ |
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
604 |
+ |
} |
605 |
+ |
if (zeroDivides) { |
606 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
607 |
+ |
errno = ERANGE; |
608 |
+ |
} |
609 |
+ |
return(1); |
610 |
+ |
} |
611 |
+ |
|
612 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
613 |
|
int |
614 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
616 |
|
double *mysf = NULL; |
617 |
|
int i, j, k; |
618 |
|
|
619 |
< |
if ((msum == NULL) | (madd == NULL) || |
619 |
> |
if (!msum | !madd || |
620 |
|
(msum->nrows != madd->nrows) | |
621 |
|
(msum->ncols != madd->ncols) | |
622 |
|
(msum->ncomp != madd->ncomp)) |
623 |
|
return(0); |
624 |
< |
if (sf == NULL) { |
624 |
> |
if (!sf) { |
625 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
626 |
< |
if (mysf == NULL) |
626 |
> |
if (!mysf) |
627 |
|
return(0); |
628 |
|
for (k = msum->ncomp; k--; ) |
629 |
|
mysf[k] = 1; |
638 |
|
for (j = msum->ncols; j--; ) |
639 |
|
for (k = msum->ncomp; k--; ) |
640 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
641 |
< |
|
642 |
< |
free(mysf); |
641 |
> |
if (mysf) |
642 |
> |
free(mysf); |
643 |
|
return(1); |
644 |
|
} |
645 |
|
|
649 |
|
{ |
650 |
|
int i, j, k; |
651 |
|
|
652 |
< |
if ((rm == NULL) | (sf == NULL)) |
652 |
> |
if (!rm | !sf) |
653 |
|
return(0); |
654 |
|
for (i = rm->nrows; i--; ) |
655 |
|
for (j = rm->ncols; j--; ) |
656 |
|
for (k = rm->ncomp; k--; ) |
657 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
658 |
|
|
659 |
+ |
if (rm->info) |
660 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
661 |
|
return(1); |
662 |
|
} |
663 |
|
|
668 |
|
int i, j, ks, kd; |
669 |
|
RMATRIX *dnew; |
670 |
|
|
671 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
671 |
> |
if (!msrc | (n <= 0) | !cmat) |
672 |
|
return(NULL); |
673 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
674 |
< |
if (dnew == NULL) |
674 |
> |
if (!dnew) |
675 |
|
return(NULL); |
676 |
+ |
if (msrc->info) { |
677 |
+ |
char buf[128]; |
678 |
+ |
sprintf(buf, "Applied %dx%d component transform\n", |
679 |
+ |
dnew->ncomp, msrc->ncomp); |
680 |
+ |
rmx_addinfo(dnew, msrc->info); |
681 |
+ |
rmx_addinfo(dnew, buf); |
682 |
+ |
} |
683 |
|
dnew->dtype = msrc->dtype; |
684 |
|
for (i = dnew->nrows; i--; ) |
685 |
|
for (j = dnew->ncols; j--; ) |
699 |
|
int i, j; |
700 |
|
RMATRIX *dnew; |
701 |
|
|
702 |
< |
if (cm == NULL) |
702 |
> |
if (!cm) |
703 |
|
return(NULL); |
704 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
705 |
< |
if (dnew == NULL) |
705 |
> |
if (!dnew) |
706 |
|
return(NULL); |
707 |
|
dnew->dtype = DTfloat; |
708 |
|
for (i = dnew->nrows; i--; ) |
722 |
|
int i, j; |
723 |
|
CMATRIX *cnew; |
724 |
|
|
725 |
< |
if (rm == NULL || rm->ncomp != 3) |
725 |
> |
if (!rm || rm->ncomp != 3) |
726 |
|
return(NULL); |
727 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
728 |
< |
if (cnew == NULL) |
728 |
> |
if (!cnew) |
729 |
|
return(NULL); |
730 |
|
for (i = cnew->nrows; i--; ) |
731 |
|
for (j = cnew->ncols; j--; ) { |