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, j; |
165 |
|
|
149 |
– |
if (rm->ncomp > 100) { |
150 |
– |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
151 |
– |
exit(1); |
152 |
– |
} |
166 |
|
for (i = 0; i < rm->nrows; i++) |
167 |
|
for (j = 0; j < rm->ncols; j++) { |
168 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
168 |
> |
if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
169 |
|
return(0); |
170 |
< |
for (k = rm->ncomp; k--; ) |
171 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
170 |
> |
if (rm->swapin) |
171 |
> |
swap64((char *)&rmx_lval(rm,i,j,0), rm->ncomp); |
172 |
|
} |
173 |
|
return(1); |
174 |
|
} |
179 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
180 |
|
int i, j; |
181 |
|
|
182 |
< |
if (scan == NULL) |
182 |
> |
if (!scan) |
183 |
|
return(0); |
184 |
|
for (i = 0; i < rm->nrows; i++) { |
185 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
204 |
|
RMATRIX dinfo; |
205 |
|
RMATRIX *dnew; |
206 |
|
|
207 |
< |
if (inspec == NULL) { /* reading from stdin? */ |
207 |
> |
if (!inspec) { /* reading from stdin? */ |
208 |
|
inspec = "<stdin>"; |
209 |
< |
#ifdef _WIN32 |
197 |
< |
_setmode(fileno(stdin), _O_BINARY); |
198 |
< |
#endif |
209 |
> |
SET_FILE_BINARY(stdin); |
210 |
|
} else if (inspec[0] == '!') { |
211 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
211 |
> |
if (!(fp = popen(inspec+1, "r"))) |
212 |
|
return(NULL); |
213 |
< |
#ifdef _WIN32 |
203 |
< |
_setmode(fileno(fp), _O_BINARY); |
204 |
< |
#endif |
213 |
> |
SET_FILE_BINARY(fp); |
214 |
|
} else { |
215 |
|
const char *sp = inspec; /* check suffix */ |
216 |
|
while (*sp) |
219 |
|
--sp; |
220 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
221 |
|
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
222 |
< |
if (cm == NULL) |
222 |
> |
if (!cm) |
223 |
|
return(NULL); |
224 |
|
dnew = rmx_from_cmatrix(cm); |
225 |
|
cm_free(cm); |
227 |
|
return(dnew); |
228 |
|
} |
229 |
|
/* else open it ourselves */ |
230 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
230 |
> |
if (!(fp = fopen(inspec, "rb"))) |
231 |
|
return(NULL); |
232 |
|
} |
233 |
|
#ifdef getc_unlocked |
235 |
|
#endif |
236 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
237 |
|
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
238 |
+ |
dinfo.swapin = 0; |
239 |
|
dinfo.info = NULL; |
240 |
+ |
dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.; |
241 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
242 |
|
fclose(fp); |
243 |
|
return(NULL); |
256 |
|
} |
257 |
|
} |
258 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
259 |
< |
if (dnew == NULL) { |
259 |
> |
if (!dnew) { |
260 |
|
fclose(fp); |
261 |
|
return(NULL); |
262 |
|
} |
263 |
|
dnew->info = dinfo.info; |
264 |
|
switch (dinfo.dtype) { |
265 |
|
case DTascii: |
266 |
< |
#ifdef _WIN32 |
256 |
< |
_setmode(fileno(fp), _O_TEXT); |
257 |
< |
#endif |
266 |
> |
SET_FILE_TEXT(fp); |
267 |
|
if (!rmx_load_ascii(dnew, fp)) |
268 |
|
goto loaderr; |
269 |
|
dnew->dtype = DTascii; /* should leave double? */ |
270 |
|
break; |
271 |
|
case DTfloat: |
272 |
+ |
dnew->swapin = dinfo.swapin; |
273 |
|
if (!rmx_load_float(dnew, fp)) |
274 |
|
goto loaderr; |
275 |
|
dnew->dtype = DTfloat; |
276 |
|
break; |
277 |
|
case DTdouble: |
278 |
+ |
dnew->swapin = dinfo.swapin; |
279 |
|
if (!rmx_load_double(dnew, fp)) |
280 |
|
goto loaderr; |
281 |
|
dnew->dtype = DTdouble; |
284 |
|
case DTxyze: |
285 |
|
if (!rmx_load_rgbe(dnew, fp)) |
286 |
|
goto loaderr; |
287 |
< |
dnew->dtype = dinfo.dtype; |
287 |
> |
dnew->dtype = dinfo.dtype; /* undo exposure? */ |
288 |
> |
if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) | |
289 |
> |
(dinfo.mtx[2] != 1.)) { |
290 |
> |
dinfo.mtx[0] = 1./dinfo.mtx[0]; |
291 |
> |
dinfo.mtx[1] = 1./dinfo.mtx[1]; |
292 |
> |
dinfo.mtx[2] = 1./dinfo.mtx[2]; |
293 |
> |
rmx_scale(dnew, dinfo.mtx); |
294 |
> |
} |
295 |
|
break; |
296 |
|
default: |
297 |
|
goto loaderr; |
319 |
|
static int |
320 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
321 |
|
{ |
322 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
323 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
324 |
+ |
" %.15e" ; |
325 |
|
int i, j, k; |
326 |
|
|
327 |
|
for (i = 0; i < rm->nrows; i++) { |
328 |
|
for (j = 0; j < rm->ncols; j++) { |
329 |
|
for (k = 0; k < rm->ncomp; k++) |
330 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
330 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
331 |
|
fputc('\t', fp); |
332 |
|
} |
333 |
|
fputc('\n', fp); |
349 |
|
for (j = 0; j < rm->ncols; j++) { |
350 |
|
for (k = rm->ncomp; k--; ) |
351 |
|
val[k] = (float)rmx_lval(rm,i,j,k); |
352 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
352 |
> |
if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
353 |
|
return(0); |
354 |
|
} |
355 |
|
return(1); |
358 |
|
static int |
359 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
360 |
|
{ |
361 |
< |
int i, j, k; |
341 |
< |
double val[100]; |
361 |
> |
int i, j; |
362 |
|
|
343 |
– |
if (rm->ncomp > 100) { |
344 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
345 |
– |
exit(1); |
346 |
– |
} |
363 |
|
for (i = 0; i < rm->nrows; i++) |
364 |
< |
for (j = 0; j < rm->ncols; j++) { |
365 |
< |
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) |
364 |
> |
for (j = 0; j < rm->ncols; j++) |
365 |
> |
if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
366 |
|
return(0); |
353 |
– |
} |
367 |
|
return(1); |
368 |
|
} |
369 |
|
|
370 |
|
static int |
371 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
372 |
|
{ |
373 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
373 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
374 |
|
int i, j; |
375 |
|
|
376 |
< |
if (scan == NULL) |
376 |
> |
if (!scan) |
377 |
|
return(0); |
378 |
|
for (i = 0; i < rm->nrows; i++) { |
379 |
|
for (j = rm->ncols; j--; ) |
380 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
380 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
381 |
|
rmx_lval(rm,i,j,1), |
382 |
|
rmx_lval(rm,i,j,2) ); |
383 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
383 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
384 |
|
free(scan); |
385 |
|
return(0); |
386 |
|
} |
396 |
|
RMATRIX *mydm = NULL; |
397 |
|
int ok = 1; |
398 |
|
|
399 |
< |
if ((rm == NULL) | (fp == NULL)) |
399 |
> |
if (!rm | !fp) |
400 |
|
return(0); |
401 |
|
#ifdef getc_unlocked |
402 |
|
flockfile(fp); |
420 |
|
return(0); |
421 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
422 |
|
mydm = rmx_transform(rm, 3, cmtx); |
423 |
< |
if (mydm == NULL) |
423 |
> |
if (!mydm) |
424 |
|
return(0); |
425 |
|
rm = mydm; |
426 |
|
} |
427 |
+ |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
428 |
+ |
fputendian(fp); /* important to record */ |
429 |
|
fputformat((char *)cm_fmt_id[dtype], fp); |
430 |
|
fputc('\n', fp); |
431 |
|
switch (dtype) { /* write data */ |
450 |
|
#ifdef getc_unlocked |
451 |
|
funlockfile(fp); |
452 |
|
#endif |
453 |
< |
rmx_free(mydm); |
453 |
> |
if (mydm) |
454 |
> |
rmx_free(mydm); |
455 |
|
return(ok); |
456 |
|
} |
457 |
|
|
462 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
463 |
|
int i, k; |
464 |
|
|
465 |
< |
if (rid == NULL) |
465 |
> |
if (!rid) |
466 |
|
return(NULL); |
467 |
|
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
468 |
|
for (i = dim; i--; ) |
477 |
|
{ |
478 |
|
RMATRIX *dnew; |
479 |
|
|
480 |
< |
if (rm == NULL) |
480 |
> |
if (!rm) |
481 |
|
return(NULL); |
482 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
483 |
< |
if (dnew == NULL) |
483 |
> |
if (!dnew) |
484 |
|
return(NULL); |
485 |
|
rmx_addinfo(dnew, rm->info); |
486 |
|
dnew->dtype = rm->dtype; |
496 |
|
RMATRIX *dnew; |
497 |
|
int i, j, k; |
498 |
|
|
499 |
< |
if (rm == NULL) |
499 |
> |
if (!rm) |
500 |
|
return(0); |
501 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
502 |
+ |
dnew = rmx_copy(rm); |
503 |
+ |
if (!dnew) |
504 |
+ |
return(NULL); |
505 |
+ |
dnew->nrows = rm->ncols; |
506 |
+ |
dnew->ncols = rm->nrows; |
507 |
+ |
return(dnew); |
508 |
+ |
} |
509 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
510 |
< |
if (dnew == NULL) |
510 |
> |
if (!dnew) |
511 |
|
return(NULL); |
512 |
|
if (rm->info) { |
513 |
|
rmx_addinfo(dnew, rm->info); |
528 |
|
RMATRIX *mres; |
529 |
|
int i, j, k, h; |
530 |
|
|
531 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
508 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
531 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
532 |
|
return(NULL); |
533 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
534 |
< |
if (mres == NULL) |
534 |
> |
if (!mres) |
535 |
|
return(NULL); |
536 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
537 |
|
if (i) |
549 |
|
return(mres); |
550 |
|
} |
551 |
|
|
552 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
553 |
+ |
int |
554 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
555 |
+ |
{ |
556 |
+ |
int zeroDivides = 0; |
557 |
+ |
int i, j, k; |
558 |
+ |
|
559 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
560 |
+ |
return(0); |
561 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
562 |
+ |
return(0); |
563 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
564 |
+ |
if (i) |
565 |
+ |
m1->dtype = i; |
566 |
+ |
else |
567 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
568 |
+ |
for (i = m1->nrows; i--; ) |
569 |
+ |
for (j = m1->ncols; j--; ) |
570 |
+ |
if (divide) { |
571 |
+ |
double d; |
572 |
+ |
if (m2->ncomp == 1) { |
573 |
+ |
d = rmx_lval(m2,i,j,0); |
574 |
+ |
if (d == 0) { |
575 |
+ |
++zeroDivides; |
576 |
+ |
for (k = m1->ncomp; k--; ) |
577 |
+ |
rmx_lval(m1,i,j,k) = 0; |
578 |
+ |
} else { |
579 |
+ |
d = 1./d; |
580 |
+ |
for (k = m1->ncomp; k--; ) |
581 |
+ |
rmx_lval(m1,i,j,k) *= d; |
582 |
+ |
} |
583 |
+ |
} else |
584 |
+ |
for (k = m1->ncomp; k--; ) { |
585 |
+ |
d = rmx_lval(m2,i,j,k); |
586 |
+ |
if (d == 0) { |
587 |
+ |
++zeroDivides; |
588 |
+ |
rmx_lval(m1,i,j,k) = 0; |
589 |
+ |
} else |
590 |
+ |
rmx_lval(m1,i,j,k) /= d; |
591 |
+ |
} |
592 |
+ |
} else { |
593 |
+ |
if (m2->ncomp == 1) { |
594 |
+ |
const double d = rmx_lval(m2,i,j,0); |
595 |
+ |
for (k = m1->ncomp; k--; ) |
596 |
+ |
rmx_lval(m1,i,j,k) *= d; |
597 |
+ |
} else |
598 |
+ |
for (k = m1->ncomp; k--; ) |
599 |
+ |
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
600 |
+ |
} |
601 |
+ |
if (zeroDivides) { |
602 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
603 |
+ |
errno = ERANGE; |
604 |
+ |
} |
605 |
+ |
return(1); |
606 |
+ |
} |
607 |
+ |
|
608 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
609 |
|
int |
610 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
612 |
|
double *mysf = NULL; |
613 |
|
int i, j, k; |
614 |
|
|
615 |
< |
if ((msum == NULL) | (madd == NULL) || |
615 |
> |
if (!msum | !madd || |
616 |
|
(msum->nrows != madd->nrows) | |
617 |
|
(msum->ncols != madd->ncols) | |
618 |
|
(msum->ncomp != madd->ncomp)) |
619 |
|
return(0); |
620 |
< |
if (sf == NULL) { |
620 |
> |
if (!sf) { |
621 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
622 |
< |
if (mysf == NULL) |
622 |
> |
if (!mysf) |
623 |
|
return(0); |
624 |
|
for (k = msum->ncomp; k--; ) |
625 |
|
mysf[k] = 1; |
634 |
|
for (j = msum->ncols; j--; ) |
635 |
|
for (k = msum->ncomp; k--; ) |
636 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
637 |
< |
|
638 |
< |
free(mysf); |
637 |
> |
if (mysf) |
638 |
> |
free(mysf); |
639 |
|
return(1); |
640 |
|
} |
641 |
|
|
645 |
|
{ |
646 |
|
int i, j, k; |
647 |
|
|
648 |
< |
if ((rm == NULL) | (sf == NULL)) |
648 |
> |
if (!rm | !sf) |
649 |
|
return(0); |
650 |
|
for (i = rm->nrows; i--; ) |
651 |
|
for (j = rm->ncols; j--; ) |
652 |
|
for (k = rm->ncomp; k--; ) |
653 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
654 |
|
|
655 |
+ |
if (rm->info) |
656 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
657 |
|
return(1); |
658 |
|
} |
659 |
|
|
664 |
|
int i, j, ks, kd; |
665 |
|
RMATRIX *dnew; |
666 |
|
|
667 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
667 |
> |
if (!msrc | (n <= 0) | !cmat) |
668 |
|
return(NULL); |
669 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
670 |
< |
if (dnew == NULL) |
670 |
> |
if (!dnew) |
671 |
|
return(NULL); |
672 |
+ |
if (msrc->info) { |
673 |
+ |
char buf[128]; |
674 |
+ |
sprintf(buf, "Applied %dx%d component transform\n", |
675 |
+ |
dnew->ncomp, msrc->ncomp); |
676 |
+ |
rmx_addinfo(dnew, msrc->info); |
677 |
+ |
rmx_addinfo(dnew, buf); |
678 |
+ |
} |
679 |
|
dnew->dtype = msrc->dtype; |
680 |
|
for (i = dnew->nrows; i--; ) |
681 |
|
for (j = dnew->ncols; j--; ) |
695 |
|
int i, j; |
696 |
|
RMATRIX *dnew; |
697 |
|
|
698 |
< |
if (cm == NULL) |
698 |
> |
if (!cm) |
699 |
|
return(NULL); |
700 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
701 |
< |
if (dnew == NULL) |
701 |
> |
if (!dnew) |
702 |
|
return(NULL); |
703 |
|
dnew->dtype = DTfloat; |
704 |
|
for (i = dnew->nrows; i--; ) |
718 |
|
int i, j; |
719 |
|
CMATRIX *cnew; |
720 |
|
|
721 |
< |
if (rm == NULL || rm->ncomp != 3) |
721 |
> |
if (!rm || rm->ncomp != 3) |
722 |
|
return(NULL); |
723 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
724 |
< |
if (cnew == NULL) |
724 |
> |
if (!cnew) |
725 |
|
return(NULL); |
726 |
|
for (i = cnew->nrows; i--; ) |
727 |
|
for (j = cnew->ncols; j--; ) { |