31 |
|
return(NULL); |
32 |
|
|
33 |
|
dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX)); |
34 |
< |
if (dnew) { |
35 |
< |
dnew->dtype = DTdouble; |
36 |
< |
dnew->nrows = nr; |
37 |
< |
dnew->ncols = nc; |
38 |
< |
dnew->ncomp = n; |
39 |
< |
setcolor(dnew->cexp, 1.f, 1.f, 1.f); |
40 |
< |
memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart)); |
41 |
< |
} |
34 |
> |
if (!dnew) |
35 |
> |
return(NULL); |
36 |
> |
|
37 |
> |
dnew->dtype = DTdouble; |
38 |
> |
dnew->nrows = nr; |
39 |
> |
dnew->ncols = nc; |
40 |
> |
dnew->ncomp = n; |
41 |
> |
setcolor(dnew->cexp, 1.f, 1.f, 1.f); |
42 |
> |
memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart)); |
43 |
> |
|
44 |
|
return(dnew); |
45 |
|
} |
46 |
|
|
70 |
|
return(dnew); |
71 |
|
} |
72 |
|
|
73 |
< |
/* Free a RMATRIX array */ |
73 |
> |
/* Clear state by freeing info and matrix data */ |
74 |
|
void |
75 |
< |
rmx_free(RMATRIX *rm) |
75 |
> |
rmx_reset(RMATRIX *rm) |
76 |
|
{ |
77 |
|
if (!rm) return; |
78 |
< |
if (rm->info) |
78 |
> |
if (rm->info) { |
79 |
|
free(rm->info); |
80 |
+ |
rm->info = NULL; |
81 |
+ |
} |
82 |
+ |
if (rm->mtx) { |
83 |
|
#ifdef MAP_FILE |
84 |
< |
if (rm->mapped) |
85 |
< |
munmap(rm->mapped, mapped_size(rm)); |
86 |
< |
else |
84 |
> |
if (rm->mapped) { |
85 |
> |
munmap(rm->mapped, mapped_size(rm)); |
86 |
> |
rm->mapped = NULL; |
87 |
> |
} else |
88 |
|
#endif |
89 |
< |
free(rm->mtx); |
89 |
> |
free(rm->mtx); |
90 |
> |
rm->mtx = NULL; |
91 |
> |
} |
92 |
> |
} |
93 |
> |
|
94 |
> |
/* Free an RMATRIX struct and data */ |
95 |
> |
void |
96 |
> |
rmx_free(RMATRIX *rm) |
97 |
> |
{ |
98 |
> |
if (!rm) return; |
99 |
> |
rmx_reset(rm); |
100 |
|
free(rm); |
101 |
|
} |
102 |
|
|
281 |
|
{ |
282 |
|
if (!rm | !fp) |
283 |
|
return(0); |
284 |
< |
if (rm->info) { /* clear state */ |
269 |
< |
free(rm->info); |
270 |
< |
rm->info = NULL; |
271 |
< |
} |
272 |
< |
if (rm->mtx) { /* ...and data */ |
273 |
< |
#ifdef MAP_FILE |
274 |
< |
if (rm->mapped) { |
275 |
< |
munmap(rm->mapped, mapped_size(rm)); |
276 |
< |
rm->mapped = NULL; |
277 |
< |
} else |
278 |
< |
#endif |
279 |
< |
free(rm->mtx); |
280 |
< |
rm->mtx = NULL; |
281 |
< |
} |
284 |
> |
rmx_reset(rm); /* clear state */ |
285 |
|
if (rm->nrows | rm->ncols | !rm->dtype) { |
286 |
|
rm->nrows = rm->ncols = 0; |
287 |
|
rm->ncomp = 3; |
289 |
|
memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart)); |
290 |
|
rm->swapin = 0; |
291 |
|
} |
289 |
– |
SET_FILE_BINARY(fp); |
292 |
|
rm->dtype = DTascii; /* assumed w/o FORMAT */ |
293 |
|
if (getheader(fp, get_dminfo, rm) < 0) { |
294 |
|
fputs("Unrecognized matrix format\n", stderr); |
295 |
|
return(0); |
296 |
|
} |
297 |
< |
/* resolution string? */ |
298 |
< |
if ((rm->nrows <= 0) | (rm->ncols <= 0)) { |
299 |
< |
if (!fscnresolu(&rm->ncols, &rm->nrows, fp)) |
300 |
< |
return(0); |
301 |
< |
if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) && |
302 |
< |
rm->ncomp != 3) |
303 |
< |
return(0); |
304 |
< |
} |
297 |
> |
if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) && |
298 |
> |
rm->ncomp != 3) |
299 |
> |
return(0); |
300 |
> |
if (rm->ncols <= 0 && /* resolution string? */ |
301 |
> |
!fscnresolu(&rm->ncols, &rm->nrows, fp)) |
302 |
> |
return(0); |
303 |
> |
if (rm->dtype == DTascii) /* set file type (WINDOWS) */ |
304 |
> |
SET_FILE_TEXT(fp); |
305 |
> |
else |
306 |
> |
SET_FILE_BINARY(fp); |
307 |
|
return(1); |
308 |
|
} |
309 |
|
|
352 |
|
(1./(1L<<20))*(double)array_size(rm)); |
353 |
|
return(0); |
354 |
|
} |
351 |
– |
if (rm->dtype == DTascii) |
352 |
– |
SET_FILE_TEXT(fp); |
355 |
|
for (i = 0; i < rm->nrows; i++) |
356 |
|
if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp)) |
357 |
|
return(0); |
381 |
|
while (sp > inspec && sp[-1] != '.') |
382 |
|
--sp; |
383 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
384 |
< |
CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) : |
384 |
> |
CMATRIX *cm = rmp==RMPnone ? (CMATRIX *)NULL : |
385 |
> |
rmp==RMPtrans ? cm_loadBTDF(inspec) : |
386 |
|
cm_loadBRDF(inspec, rmp==RMPreflB) ; |
387 |
|
if (!cm) |
388 |
|
return(NULL); |
398 |
|
#ifdef getc_unlocked |
399 |
|
flockfile(fp); |
400 |
|
#endif |
401 |
< |
/* load header info */ |
401 |
> |
SET_FILE_BINARY(fp); /* load header info */ |
402 |
|
if (!rmx_load_header(dnew = rmx_new(0,0,3), fp)) { |
403 |
|
fprintf(stderr, "Bad header in: %s\n", inspec); |
404 |
|
if (inspec[0] == '!') pclose(fp); |
446 |
|
} |
447 |
|
|
448 |
|
static int |
449 |
< |
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
449 |
> |
rmx_write_ascii(const double *dp, int nc, int len, FILE *fp) |
450 |
|
{ |
451 |
< |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
452 |
< |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) | |
453 |
< |
(rm->dtype == DTspec) ? " %.3e" : " %.15e" ; |
454 |
< |
int i, j, k; |
452 |
< |
|
453 |
< |
for (i = 0; i < rm->nrows; i++) { |
454 |
< |
for (j = 0; j < rm->ncols; j++) { |
455 |
< |
const double *dp = rmx_val(rm,i,j); |
456 |
< |
for (k = 0; k < rm->ncomp; k++) |
457 |
< |
fprintf(fp, fmt, dp[k]); |
451 |
> |
while (len-- > 0) { |
452 |
> |
int k = nc; |
453 |
> |
while (k-- > 0) |
454 |
> |
fprintf(fp, " %.7e", *dp++); |
455 |
|
fputc('\t', fp); |
459 |
– |
} |
460 |
– |
fputc('\n', fp); |
456 |
|
} |
457 |
< |
return(1); |
457 |
> |
return(fputc('\n', fp) != EOF); |
458 |
|
} |
459 |
|
|
460 |
|
static int |
461 |
< |
rmx_write_float(const RMATRIX *rm, FILE *fp) |
461 |
> |
rmx_write_float(const double *dp, int len, FILE *fp) |
462 |
|
{ |
463 |
< |
int i, j, k; |
469 |
< |
float val[100]; |
463 |
> |
float val; |
464 |
|
|
465 |
< |
if (rm->ncomp > 100) { |
466 |
< |
fputs("Unsupported # components in rmx_write_float()\n", stderr); |
467 |
< |
exit(1); |
474 |
< |
} |
475 |
< |
for (i = 0; i < rm->nrows; i++) |
476 |
< |
for (j = 0; j < rm->ncols; j++) { |
477 |
< |
const double *dp = rmx_val(rm,i,j); |
478 |
< |
for (k = rm->ncomp; k--; ) |
479 |
< |
val[k] = (float)dp[k]; |
480 |
< |
if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp) |
465 |
> |
while (len--) { |
466 |
> |
val = *dp++; |
467 |
> |
if (putbinary(&val, sizeof(float), 1, fp) != 1) |
468 |
|
return(0); |
469 |
< |
} |
469 |
> |
} |
470 |
|
return(1); |
471 |
|
} |
472 |
|
|
473 |
|
static int |
474 |
< |
rmx_write_double(const RMATRIX *rm, FILE *fp) |
474 |
> |
rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp) |
475 |
|
{ |
476 |
< |
return(putbinary(rm->mtx, sizeof(rm->mtx[0])*rm->ncomp, |
477 |
< |
rm->nrows*rm->ncols, fp) == rm->nrows*rm->ncols); |
491 |
< |
} |
476 |
> |
COLR *scan; |
477 |
> |
int j; |
478 |
|
|
479 |
< |
static int |
480 |
< |
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
481 |
< |
{ |
496 |
< |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
497 |
< |
int i, j; |
479 |
> |
if ((nc != 1) & (nc != 3)) return(0); |
480 |
> |
scan = (COLR *)tempbuffer(sizeof(COLR)*len); |
481 |
> |
if (!scan) return(0); |
482 |
|
|
483 |
< |
if (!scan) |
484 |
< |
return(0); |
501 |
< |
for (i = 0; i < rm->nrows; i++) { |
502 |
< |
for (j = rm->ncols; j--; ) { |
503 |
< |
const double *dp = rmx_val(rm,i,j); |
504 |
< |
if (rm->ncomp == 1) |
483 |
> |
for (j = 0; j < len; j++, dp += nc) |
484 |
> |
if (nc == 1) |
485 |
|
setcolr(scan[j], dp[0], dp[0], dp[0]); |
486 |
|
else |
487 |
|
setcolr(scan[j], dp[0], dp[1], dp[2]); |
488 |
< |
} |
489 |
< |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
510 |
< |
free(scan); |
511 |
< |
return(0); |
512 |
< |
} |
513 |
< |
} |
514 |
< |
free(scan); |
515 |
< |
return(1); |
488 |
> |
|
489 |
> |
return(fwritecolrs(scan, len, fp) >= 0); |
490 |
|
} |
491 |
|
|
492 |
|
static int |
493 |
< |
rmx_write_spec(const RMATRIX *rm, FILE *fp) |
493 |
> |
rmx_write_spec(const double *dp, int nc, int len, FILE *fp) |
494 |
|
{ |
495 |
< |
uby8 *scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
522 |
< |
int ok = 1; |
495 |
> |
uby8 *scan; |
496 |
|
SCOLOR scol; |
497 |
< |
int i, j, k; |
497 |
> |
int j, k; |
498 |
|
|
499 |
< |
if (!scan) |
500 |
< |
return(0); |
501 |
< |
for (i = 0; i < rm->nrows; i++) { |
502 |
< |
for (j = rm->ncols; j--; ) { |
503 |
< |
const double *dp = rmx_val(rm,i,j); |
531 |
< |
for (k = rm->ncomp; k--; ) |
499 |
> |
if (nc < 3) return(0); |
500 |
> |
scan = (uby8 *)tempbuffer((nc+1)*len); |
501 |
> |
if (!scan) return(0); |
502 |
> |
for (j = len; j--; dp += nc) { |
503 |
> |
for (k = nc; k--; ) |
504 |
|
scol[k] = dp[k]; |
505 |
< |
scolor2scolr(scan+j*(rm->ncomp+1), scol, rm->ncomp); |
534 |
< |
} |
535 |
< |
if (fwritescolrs(scan, rm->ncomp, rm->ncols, fp) < 0) { |
536 |
< |
ok = 0; |
537 |
< |
break; |
538 |
< |
} |
505 |
> |
scolor2scolr(scan+j*(nc+1), scol, nc); |
506 |
|
} |
507 |
< |
free(scan); |
541 |
< |
return(ok); |
507 |
> |
return(fwritescolrs(scan, nc, len, fp) >= 0); |
508 |
|
} |
509 |
|
|
510 |
|
/* Check if CIE XYZ primaries were specified */ |
524 |
|
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
525 |
|
} |
526 |
|
|
527 |
< |
/* Write matrix to file type indicated by dtype */ |
527 |
> |
/* Finish writing header data with resolution and format, returning type used */ |
528 |
|
int |
529 |
< |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
529 |
> |
rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp) |
530 |
|
{ |
531 |
< |
int ok = 1; |
566 |
< |
|
567 |
< |
if (!rm | !fp || !rm->mtx) |
531 |
> |
if (!rm | !fp || rm->ncols <= 0) |
532 |
|
return(0); |
533 |
< |
#ifdef getc_unlocked |
570 |
< |
flockfile(fp); |
571 |
< |
#endif |
572 |
< |
if (rm->info) /* complete header */ |
533 |
> |
if (rm->info) |
534 |
|
fputs(rm->info, fp); |
535 |
|
if (dtype == DTfromHeader) |
536 |
|
dtype = rm->dtype; |
539 |
|
dtype = DTxyze; |
540 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
541 |
|
dtype = DTrgbe; |
542 |
+ |
if ((dtype < DTspec) & (rm->ncomp > 3)) |
543 |
+ |
dtype = DTspec; |
544 |
+ |
else if ((dtype == DTspec) & (rm->ncomp <= 3)) |
545 |
+ |
return(0); |
546 |
+ |
|
547 |
+ |
if (dtype == DTascii) /* set file type (WINDOWS) */ |
548 |
+ |
SET_FILE_TEXT(fp); |
549 |
+ |
else |
550 |
+ |
SET_FILE_BINARY(fp); |
551 |
|
/* write exposure? */ |
552 |
|
if (rm->ncomp == 3 && (rm->cexp[RED] != rm->cexp[GRN]) | |
553 |
|
(rm->cexp[GRN] != rm->cexp[BLU])) |
554 |
|
fputcolcor(rm->cexp, fp); |
555 |
|
else if (rm->cexp[GRN] != 1.f) |
556 |
|
fputexpos(rm->cexp[GRN], fp); |
557 |
< |
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
558 |
< |
if (dtype != DTspec) { |
557 |
> |
/* matrix size? */ |
558 |
> |
if ((dtype > DTspec) | (rm->nrows <= 0)) { |
559 |
> |
if (rm->nrows > 0) |
560 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
561 |
< |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
562 |
< |
} else if (rm->ncomp < 3) |
563 |
< |
return(0); /* bad # components */ |
561 |
> |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
562 |
> |
} |
563 |
> |
if (dtype >= DTspec) { /* # components & split? */ |
564 |
|
fputncomp(rm->ncomp, fp); |
565 |
< |
if (dtype == DTspec || (rm->ncomp > 3 && |
566 |
< |
memcmp(rm->wlpart, WLPART, sizeof(WLPART)))) |
565 |
> |
if (rm->ncomp > 3 && |
566 |
> |
memcmp(rm->wlpart, WLPART, sizeof(WLPART))) |
567 |
|
fputwlsplit(rm->wlpart, fp); |
568 |
|
} else if ((rm->ncomp != 3) & (rm->ncomp != 1)) |
569 |
|
return(0); /* wrong # components */ |
571 |
|
fputendian(fp); /* important to record */ |
572 |
|
fputformat(cm_fmt_id[dtype], fp); |
573 |
|
fputc('\n', fp); /* end of header */ |
574 |
< |
switch (dtype) { /* write data */ |
574 |
> |
if ((dtype <= DTspec) & (rm->nrows > 0)) |
575 |
> |
fprtresolu(rm->ncols, rm->nrows, fp); |
576 |
> |
return(dtype); |
577 |
> |
} |
578 |
> |
|
579 |
> |
/* Write out matrix data (usually by row) */ |
580 |
> |
int |
581 |
> |
rmx_write_data(const double *dp, int nc, int len, int dtype, FILE *fp) |
582 |
> |
{ |
583 |
> |
switch (dtype) { |
584 |
|
case DTascii: |
585 |
< |
ok = rmx_write_ascii(rm, fp); |
606 |
< |
break; |
585 |
> |
return(rmx_write_ascii(dp, nc, len, fp)); |
586 |
|
case DTfloat: |
587 |
< |
ok = rmx_write_float(rm, fp); |
609 |
< |
break; |
587 |
> |
return(rmx_write_float(dp, nc*len, fp)); |
588 |
|
case DTdouble: |
589 |
< |
ok = rmx_write_double(rm, fp); |
612 |
< |
break; |
589 |
> |
return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len); |
590 |
|
case DTrgbe: |
591 |
|
case DTxyze: |
592 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
616 |
< |
ok = rmx_write_rgbe(rm, fp); |
617 |
< |
break; |
592 |
> |
return(rmx_write_rgbe(dp, nc, len, fp)); |
593 |
|
case DTspec: |
594 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
620 |
< |
ok = rmx_write_spec(rm, fp); |
621 |
< |
break; |
622 |
< |
default: |
623 |
< |
return(0); |
594 |
> |
return(rmx_write_spec(dp, nc, len, fp)); |
595 |
|
} |
596 |
< |
ok &= (fflush(fp) == 0); |
596 |
> |
return(0); |
597 |
> |
} |
598 |
> |
|
599 |
> |
/* Write matrix using file format indicated by dtype */ |
600 |
> |
int |
601 |
> |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
602 |
> |
{ |
603 |
> |
int ok = 0; |
604 |
> |
int i; |
605 |
> |
/* complete header */ |
606 |
> |
dtype = rmx_write_header(rm, dtype, fp); |
607 |
> |
if (dtype <= 0) |
608 |
> |
return(0); |
609 |
|
#ifdef getc_unlocked |
610 |
+ |
flockfile(fp); |
611 |
+ |
#endif |
612 |
+ |
if (dtype == DTdouble) /* write all at once? */ |
613 |
+ |
ok = rmx_write_data(rm->mtx, rm->ncomp, |
614 |
+ |
rm->nrows*rm->ncols, dtype, fp); |
615 |
+ |
else /* else row by row */ |
616 |
+ |
for (i = 0; i < rm->nrows; i++) { |
617 |
+ |
ok = rmx_write_data(rmx_val(rm,i,0), rm->ncomp, |
618 |
+ |
rm->ncols, dtype, fp); |
619 |
+ |
if (!ok) break; |
620 |
+ |
} |
621 |
+ |
|
622 |
+ |
if (ok) ok = (fflush(fp) == 0); |
623 |
+ |
#ifdef getc_unlocked |
624 |
|
funlockfile(fp); |
625 |
|
#endif |
626 |
|
if (!ok) fputs("Error writing matrix\n", stderr); |
645 |
|
return(rid); |
646 |
|
} |
647 |
|
|
648 |
< |
/* Duplicate the given matrix */ |
648 |
> |
/* Duplicate the given matrix (may be unallocated) */ |
649 |
|
RMATRIX * |
650 |
|
rmx_copy(const RMATRIX *rm) |
651 |
|
{ |
653 |
|
|
654 |
|
if (!rm) |
655 |
|
return(NULL); |
656 |
< |
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
656 |
> |
dnew = rmx_new(rm->nrows, rm->ncols, rm->ncomp); |
657 |
|
if (!dnew) |
658 |
|
return(NULL); |
659 |
+ |
if (rm->mtx) { |
660 |
+ |
if (!rmx_prepare(dnew)) { |
661 |
+ |
rmx_free(dnew); |
662 |
+ |
return(NULL); |
663 |
+ |
} |
664 |
+ |
memcpy(dnew->mtx, rm->mtx, array_size(dnew)); |
665 |
+ |
} |
666 |
|
rmx_addinfo(dnew, rm->info); |
667 |
|
dnew->dtype = rm->dtype; |
668 |
|
copycolor(dnew->cexp, rm->cexp); |
669 |
|
memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart)); |
666 |
– |
memcpy(dnew->mtx, rm->mtx, array_size(dnew)); |
670 |
|
return(dnew); |
671 |
|
} |
672 |
|
|
673 |
+ |
/* Replace data in first matrix with data from second */ |
674 |
+ |
int |
675 |
+ |
rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa) |
676 |
+ |
{ |
677 |
+ |
if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) | |
678 |
+ |
(rdst->ncols != rsrc->ncols) | |
679 |
+ |
(rdst->ncomp != rsrc->ncomp)) |
680 |
+ |
return(0); |
681 |
+ |
|
682 |
+ |
if (dometa) { /* transfer everything? */ |
683 |
+ |
rmx_reset(rdst); |
684 |
+ |
*rdst = *rsrc; |
685 |
+ |
rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL; |
686 |
+ |
return(1); |
687 |
+ |
} |
688 |
+ |
#ifdef MAP_FILE /* just matrix data -- leave metadata */ |
689 |
+ |
if (rdst->mapped) |
690 |
+ |
munmap(rdst->mapped, mapped_size(rdst)); |
691 |
+ |
else |
692 |
+ |
#endif |
693 |
+ |
if (rdst->mtx) |
694 |
+ |
free(rdst->mtx); |
695 |
+ |
rdst->mapped = rsrc->mapped; |
696 |
+ |
rdst->mtx = rsrc->mtx; |
697 |
+ |
rsrc->mapped = NULL; rsrc->mtx = NULL; |
698 |
+ |
return(1); |
699 |
+ |
} |
700 |
+ |
|
701 |
|
/* Allocate and assign transposed matrix */ |
702 |
|
RMATRIX * |
703 |
|
rmx_transpose(const RMATRIX *rm) |
705 |
|
RMATRIX *dnew; |
706 |
|
int i, j; |
707 |
|
|
708 |
< |
if (!rm) |
708 |
> |
if (!rm || !rm->mtx) |
709 |
|
return(0); |
710 |
|
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
711 |
|
dnew = rmx_copy(rm); |
739 |
|
RMATRIX *mres; |
740 |
|
int i, j, k, h; |
741 |
|
|
742 |
< |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
742 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
743 |
> |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
744 |
|
return(NULL); |
745 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
746 |
|
if (!mres) |
768 |
|
int zeroDivides = 0; |
769 |
|
int i, j, k; |
770 |
|
|
771 |
< |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
771 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
772 |
> |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
773 |
|
return(0); |
774 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
775 |
|
return(0); |
825 |
|
double *mysf = NULL; |
826 |
|
int i, j, k; |
827 |
|
|
828 |
< |
if (!msum | !madd || |
828 |
> |
if (!msum | !madd || !msum->mtx | !madd->mtx | |
829 |
|
(msum->nrows != madd->nrows) | |
830 |
|
(msum->ncols != madd->ncols) | |
831 |
|
(msum->ncomp != madd->ncomp)) |
861 |
|
{ |
862 |
|
int i, j, k; |
863 |
|
|
864 |
< |
if (!rm | !sf) |
864 |
> |
if (!rm | !sf || !rm->mtx) |
865 |
|
return(0); |
866 |
|
for (i = rm->nrows; i--; ) |
867 |
|
for (j = rm->ncols; j--; ) { |
882 |
|
int i, j, ks, kd; |
883 |
|
RMATRIX *dnew; |
884 |
|
|
885 |
< |
if (!msrc | (n <= 0) | !cmat) |
885 |
> |
if (!msrc | (n <= 0) | !cmat || !msrc->mtx) |
886 |
|
return(NULL); |
887 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
888 |
|
if (!dnew) |