68 |
|
return(dnew); |
69 |
|
} |
70 |
|
|
71 |
< |
/* Free a RMATRIX array */ |
71 |
> |
/* Clear state by freeing info and matrix data */ |
72 |
|
void |
73 |
< |
rmx_free(RMATRIX *rm) |
73 |
> |
rmx_reset(RMATRIX *rm) |
74 |
|
{ |
75 |
|
if (!rm) return; |
76 |
< |
if (rm->info) |
76 |
> |
if (rm->info) { |
77 |
|
free(rm->info); |
78 |
+ |
rm->info = NULL; |
79 |
+ |
} |
80 |
+ |
if (rm->mtx) { |
81 |
|
#ifdef MAP_FILE |
82 |
< |
if (rm->mapped) |
83 |
< |
munmap(rm->mapped, mapped_size(rm)); |
84 |
< |
else |
82 |
> |
if (rm->mapped) { |
83 |
> |
munmap(rm->mapped, mapped_size(rm)); |
84 |
> |
rm->mapped = NULL; |
85 |
> |
} else |
86 |
|
#endif |
87 |
< |
free(rm->mtx); |
87 |
> |
free(rm->mtx); |
88 |
> |
rm->mtx = NULL; |
89 |
> |
} |
90 |
> |
} |
91 |
> |
|
92 |
> |
/* Free an RMATRIX struct and data */ |
93 |
> |
void |
94 |
> |
rmx_free(RMATRIX *rm) |
95 |
> |
{ |
96 |
> |
if (!rm) return; |
97 |
> |
rmx_reset(rm); |
98 |
|
free(rm); |
99 |
|
} |
100 |
|
|
279 |
|
{ |
280 |
|
if (!rm | !fp) |
281 |
|
return(0); |
282 |
< |
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 |
< |
} |
282 |
> |
rmx_reset(rm); /* clear state */ |
283 |
|
if (rm->nrows | rm->ncols | !rm->dtype) { |
284 |
|
rm->nrows = rm->ncols = 0; |
285 |
|
rm->ncomp = 3; |
287 |
|
memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart)); |
288 |
|
rm->swapin = 0; |
289 |
|
} |
289 |
– |
SET_FILE_BINARY(fp); |
290 |
|
rm->dtype = DTascii; /* assumed w/o FORMAT */ |
291 |
|
if (getheader(fp, get_dminfo, rm) < 0) { |
292 |
|
fputs("Unrecognized matrix format\n", stderr); |
293 |
|
return(0); |
294 |
|
} |
295 |
< |
/* resolution string? */ |
296 |
< |
if ((rm->nrows <= 0) | (rm->ncols <= 0)) { |
297 |
< |
if (!fscnresolu(&rm->ncols, &rm->nrows, fp)) |
298 |
< |
return(0); |
299 |
< |
if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) && |
300 |
< |
rm->ncomp != 3) |
301 |
< |
return(0); |
302 |
< |
} |
295 |
> |
if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) && |
296 |
> |
rm->ncomp != 3) |
297 |
> |
return(0); |
298 |
> |
if (rm->ncols <= 0 && /* resolution string? */ |
299 |
> |
!fscnresolu(&rm->ncols, &rm->nrows, fp)) |
300 |
> |
return(0); |
301 |
> |
if (rm->dtype == DTascii) /* set file type (WINDOWS) */ |
302 |
> |
SET_FILE_TEXT(fp); |
303 |
> |
else |
304 |
> |
SET_FILE_BINARY(fp); |
305 |
|
return(1); |
306 |
|
} |
307 |
|
|
350 |
|
(1./(1L<<20))*(double)array_size(rm)); |
351 |
|
return(0); |
352 |
|
} |
351 |
– |
if (rm->dtype == DTascii) |
352 |
– |
SET_FILE_TEXT(fp); |
353 |
|
for (i = 0; i < rm->nrows; i++) |
354 |
|
if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp)) |
355 |
|
return(0); |
372 |
|
fp = stdin; |
373 |
|
else if (inspec[0] == '!') |
374 |
|
fp = popen(inspec+1, "r"); |
375 |
< |
else { |
375 |
> |
else if (rmp != RMPnone) { |
376 |
|
const char *sp = inspec; /* check suffix */ |
377 |
|
while (*sp) |
378 |
|
++sp; |
395 |
|
#ifdef getc_unlocked |
396 |
|
flockfile(fp); |
397 |
|
#endif |
398 |
< |
/* load header info */ |
398 |
> |
SET_FILE_BINARY(fp); /* load header info */ |
399 |
|
if (!rmx_load_header(dnew = rmx_new(0,0,3), fp)) { |
400 |
|
fprintf(stderr, "Bad header in: %s\n", inspec); |
401 |
|
if (inspec[0] == '!') pclose(fp); |
443 |
|
} |
444 |
|
|
445 |
|
static int |
446 |
< |
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
446 |
> |
rmx_write_ascii(const double *dp, int nc, int len, FILE *fp) |
447 |
|
{ |
448 |
< |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
449 |
< |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) | |
450 |
< |
(rm->dtype == DTspec) ? " %.3e" : " %.15e" ; |
451 |
< |
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]); |
448 |
> |
while (len-- > 0) { |
449 |
> |
int k = nc; |
450 |
> |
while (nc-- > 0) |
451 |
> |
fprintf(fp, " %.7e", *dp++); |
452 |
|
fputc('\t', fp); |
459 |
– |
} |
460 |
– |
fputc('\n', fp); |
453 |
|
} |
454 |
< |
return(1); |
454 |
> |
return(fputc('\n', fp) != EOF); |
455 |
|
} |
456 |
|
|
457 |
|
static int |
458 |
< |
rmx_write_float(const RMATRIX *rm, FILE *fp) |
458 |
> |
rmx_write_float(const double *dp, int len, FILE *fp) |
459 |
|
{ |
460 |
< |
int i, j, k; |
469 |
< |
float val[100]; |
460 |
> |
float val; |
461 |
|
|
462 |
< |
if (rm->ncomp > 100) { |
463 |
< |
fputs("Unsupported # components in rmx_write_float()\n", stderr); |
464 |
< |
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) |
462 |
> |
while (len--) { |
463 |
> |
val = *dp++; |
464 |
> |
if (putbinary(&val, sizeof(float), 1, fp) != 1) |
465 |
|
return(0); |
466 |
< |
} |
466 |
> |
} |
467 |
|
return(1); |
468 |
|
} |
469 |
|
|
470 |
|
static int |
471 |
< |
rmx_write_double(const RMATRIX *rm, FILE *fp) |
471 |
> |
rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp) |
472 |
|
{ |
473 |
< |
int i; |
473 |
> |
COLR *scan; |
474 |
> |
int j; |
475 |
|
|
476 |
< |
for (i = 0; i < rm->nrows; i++) |
477 |
< |
if (putbinary(rmx_val(rm,i,0), sizeof(double)*rm->ncomp, |
478 |
< |
rm->ncols, fp) != rm->ncols) |
494 |
< |
return(0); |
495 |
< |
return(1); |
496 |
< |
} |
476 |
> |
if ((nc != 1) & (nc != 3)) return(0); |
477 |
> |
scan = (COLR *)tempbuffer(sizeof(COLR)*len); |
478 |
> |
if (!scan) return(0); |
479 |
|
|
480 |
< |
static int |
481 |
< |
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
500 |
< |
{ |
501 |
< |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
502 |
< |
int i, j; |
503 |
< |
|
504 |
< |
if (!scan) |
505 |
< |
return(0); |
506 |
< |
for (i = 0; i < rm->nrows; i++) { |
507 |
< |
for (j = rm->ncols; j--; ) { |
508 |
< |
const double *dp = rmx_val(rm,i,j); |
509 |
< |
if (rm->ncomp == 1) |
480 |
> |
for (j = 0; j < len; j++, dp += nc) |
481 |
> |
if (nc == 1) |
482 |
|
setcolr(scan[j], dp[0], dp[0], dp[0]); |
483 |
|
else |
484 |
|
setcolr(scan[j], dp[0], dp[1], dp[2]); |
485 |
< |
} |
486 |
< |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
515 |
< |
free(scan); |
516 |
< |
return(0); |
517 |
< |
} |
518 |
< |
} |
519 |
< |
free(scan); |
520 |
< |
return(1); |
485 |
> |
|
486 |
> |
return(fwritecolrs(scan, len, fp) >= 0); |
487 |
|
} |
488 |
|
|
489 |
|
static int |
490 |
< |
rmx_write_spec(const RMATRIX *rm, FILE *fp) |
490 |
> |
rmx_write_spec(const double *dp, int nc, int len, FILE *fp) |
491 |
|
{ |
492 |
< |
uby8 *scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
527 |
< |
int ok = 1; |
492 |
> |
uby8 *scan; |
493 |
|
SCOLOR scol; |
494 |
< |
int i, j, k; |
494 |
> |
int j, k; |
495 |
|
|
496 |
< |
if (!scan) |
497 |
< |
return(0); |
498 |
< |
for (i = 0; i < rm->nrows; i++) { |
499 |
< |
for (j = rm->ncols; j--; ) { |
500 |
< |
const double *dp = rmx_val(rm,i,j); |
536 |
< |
for (k = rm->ncomp; k--; ) |
496 |
> |
if (nc < 3) return(0); |
497 |
> |
scan = (uby8 *)tempbuffer((nc+1)*len); |
498 |
> |
if (!scan) return(0); |
499 |
> |
for (j = len; j--; dp += nc) { |
500 |
> |
for (k = nc; k--; ) |
501 |
|
scol[k] = dp[k]; |
502 |
< |
scolor2scolr(scan+j*(rm->ncomp+1), scol, rm->ncomp); |
539 |
< |
} |
540 |
< |
if (fwritescolrs(scan, rm->ncomp, rm->ncols, fp) < 0) { |
541 |
< |
ok = 0; |
542 |
< |
break; |
543 |
< |
} |
502 |
> |
scolor2scolr(scan+j*(nc+1), scol, nc); |
503 |
|
} |
504 |
< |
free(scan); |
546 |
< |
return(ok); |
504 |
> |
return(fwritescolrs(scan, nc, len, fp) >= 0); |
505 |
|
} |
506 |
|
|
507 |
|
/* Check if CIE XYZ primaries were specified */ |
521 |
|
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
522 |
|
} |
523 |
|
|
524 |
< |
/* Write matrix to file type indicated by dtype */ |
524 |
> |
/* Finish writing header data with resolution and format, returning type used */ |
525 |
|
int |
526 |
< |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
526 |
> |
rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp) |
527 |
|
{ |
528 |
< |
int ok = 1; |
571 |
< |
|
572 |
< |
if (!rm | !fp || !rm->mtx) |
528 |
> |
if (!rm | !fp || !rm->mtx | (rm->ncols <= 0)) |
529 |
|
return(0); |
530 |
< |
#ifdef getc_unlocked |
575 |
< |
flockfile(fp); |
576 |
< |
#endif |
577 |
< |
if (rm->info) /* complete header */ |
530 |
> |
if (rm->info) |
531 |
|
fputs(rm->info, fp); |
532 |
|
if (dtype == DTfromHeader) |
533 |
|
dtype = rm->dtype; |
536 |
|
dtype = DTxyze; |
537 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
538 |
|
dtype = DTrgbe; |
539 |
+ |
if ((dtype == DTspec) & (rm->ncomp < 3)) |
540 |
+ |
return(0); |
541 |
+ |
|
542 |
+ |
if (dtype == DTascii) /* set file type (WINDOWS) */ |
543 |
+ |
SET_FILE_TEXT(fp); |
544 |
+ |
else |
545 |
+ |
SET_FILE_BINARY(fp); |
546 |
|
/* write exposure? */ |
547 |
|
if (rm->ncomp == 3 && (rm->cexp[RED] != rm->cexp[GRN]) | |
548 |
|
(rm->cexp[GRN] != rm->cexp[BLU])) |
549 |
|
fputcolcor(rm->cexp, fp); |
550 |
|
else if (rm->cexp[GRN] != 1.f) |
551 |
|
fputexpos(rm->cexp[GRN], fp); |
552 |
< |
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
553 |
< |
if (dtype != DTspec) { |
552 |
> |
/* matrix size? */ |
553 |
> |
if ((dtype > DTspec) | (rm->nrows <= 0)) { |
554 |
> |
if (rm->nrows > 0) |
555 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
556 |
< |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
557 |
< |
} else if (rm->ncomp < 3) |
558 |
< |
return(0); /* bad # components */ |
556 |
> |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
557 |
> |
} |
558 |
> |
if (dtype >= DTspec) { /* # components & split? */ |
559 |
|
fputncomp(rm->ncomp, fp); |
560 |
|
if (dtype == DTspec || (rm->ncomp > 3 && |
561 |
|
memcmp(rm->wlpart, WLPART, sizeof(WLPART)))) |
566 |
|
fputendian(fp); /* important to record */ |
567 |
|
fputformat(cm_fmt_id[dtype], fp); |
568 |
|
fputc('\n', fp); /* end of header */ |
569 |
< |
switch (dtype) { /* write data */ |
569 |
> |
if ((dtype <= DTspec) & (rm->nrows > 0)) |
570 |
> |
fprtresolu(rm->ncols, rm->nrows, fp); |
571 |
> |
return(dtype); |
572 |
> |
} |
573 |
> |
|
574 |
> |
/* Write out matrix data (usually by row) */ |
575 |
> |
int |
576 |
> |
rmx_write_data(const double *dp, int nc, int len, int dtype, FILE *fp) |
577 |
> |
{ |
578 |
> |
switch (dtype) { |
579 |
|
case DTascii: |
580 |
< |
ok = rmx_write_ascii(rm, fp); |
611 |
< |
break; |
580 |
> |
return(rmx_write_ascii(dp, nc, len, fp)); |
581 |
|
case DTfloat: |
582 |
< |
ok = rmx_write_float(rm, fp); |
614 |
< |
break; |
582 |
> |
return(rmx_write_float(dp, nc*len, fp)); |
583 |
|
case DTdouble: |
584 |
< |
ok = rmx_write_double(rm, fp); |
617 |
< |
break; |
584 |
> |
return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len); |
585 |
|
case DTrgbe: |
586 |
|
case DTxyze: |
587 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
621 |
< |
ok = rmx_write_rgbe(rm, fp); |
622 |
< |
break; |
587 |
> |
return(rmx_write_rgbe(dp, nc, len, fp)); |
588 |
|
case DTspec: |
589 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
625 |
< |
ok = rmx_write_spec(rm, fp); |
626 |
< |
break; |
627 |
< |
default: |
628 |
< |
return(0); |
589 |
> |
return(rmx_write_spec(dp, nc, len, fp)); |
590 |
|
} |
591 |
< |
ok &= (fflush(fp) == 0); |
591 |
> |
return(0); |
592 |
> |
} |
593 |
> |
|
594 |
> |
/* Write matrix using file format indicated by dtype */ |
595 |
> |
int |
596 |
> |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
597 |
> |
{ |
598 |
> |
int ok = 0; |
599 |
> |
int i; |
600 |
> |
/* complete header */ |
601 |
> |
dtype = rmx_write_header(rm, dtype, fp); |
602 |
> |
if (dtype <= 0) |
603 |
> |
return(0); |
604 |
|
#ifdef getc_unlocked |
605 |
+ |
flockfile(fp); |
606 |
+ |
#endif |
607 |
+ |
if (dtype == DTdouble) /* write all at once? */ |
608 |
+ |
ok = rmx_write_data(rm->mtx, rm->ncomp, |
609 |
+ |
rm->nrows*rm->ncols, dtype, fp); |
610 |
+ |
else /* else row by row */ |
611 |
+ |
for (i = 0; i < rm->nrows; i++) { |
612 |
+ |
ok = rmx_write_data(rmx_val(rm,i,0), rm->ncomp, |
613 |
+ |
rm->ncols, dtype, fp); |
614 |
+ |
if (!ok) break; |
615 |
+ |
} |
616 |
+ |
|
617 |
+ |
if (ok) ok = (fflush(fp) == 0); |
618 |
+ |
#ifdef getc_unlocked |
619 |
|
funlockfile(fp); |
620 |
|
#endif |
621 |
|
if (!ok) fputs("Error writing matrix\n", stderr); |
646 |
|
{ |
647 |
|
RMATRIX *dnew; |
648 |
|
|
649 |
< |
if (!rm) |
649 |
> |
if (!rm || !rm->mtx) |
650 |
|
return(NULL); |
651 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
652 |
|
if (!dnew) |
666 |
|
RMATRIX *dnew; |
667 |
|
int i, j; |
668 |
|
|
669 |
< |
if (!rm) |
669 |
> |
if (!rm || !rm->mtx) |
670 |
|
return(0); |
671 |
|
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
672 |
|
dnew = rmx_copy(rm); |
700 |
|
RMATRIX *mres; |
701 |
|
int i, j, k, h; |
702 |
|
|
703 |
< |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
703 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
704 |
> |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
705 |
|
return(NULL); |
706 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
707 |
|
if (!mres) |
729 |
|
int zeroDivides = 0; |
730 |
|
int i, j, k; |
731 |
|
|
732 |
< |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
732 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
733 |
> |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
734 |
|
return(0); |
735 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
736 |
|
return(0); |
786 |
|
double *mysf = NULL; |
787 |
|
int i, j, k; |
788 |
|
|
789 |
< |
if (!msum | !madd || |
789 |
> |
if (!msum | !madd || !msum->mtx | !madd->mtx | |
790 |
|
(msum->nrows != madd->nrows) | |
791 |
|
(msum->ncols != madd->ncols) | |
792 |
|
(msum->ncomp != madd->ncomp)) |
822 |
|
{ |
823 |
|
int i, j, k; |
824 |
|
|
825 |
< |
if (!rm | !sf) |
825 |
> |
if (!rm | !sf || !rm->mtx) |
826 |
|
return(0); |
827 |
|
for (i = rm->nrows; i--; ) |
828 |
|
for (j = rm->ncols; j--; ) { |
843 |
|
int i, j, ks, kd; |
844 |
|
RMATRIX *dnew; |
845 |
|
|
846 |
< |
if (!msrc | (n <= 0) | !cmat) |
846 |
> |
if (!msrc | (n <= 0) | !cmat || !msrc->mtx) |
847 |
|
return(NULL); |
848 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
849 |
|
if (!dnew) |