| 574 |
|
return(0); |
| 575 |
|
if (rm->info) |
| 576 |
|
fputs(rm->info, fp); |
| 577 |
< |
if (dtype == DTfromHeader) |
| 577 |
> |
if (dtype == DTfromHeader) { |
| 578 |
|
dtype = rm->dtype; |
| 579 |
< |
else if (dtype == DTrgbe && (rm->dtype == DTxyze || |
| 579 |
> |
#if DTrmx_native==DTfloat |
| 580 |
> |
if (dtype == DTdouble) /* but stored as float? */ |
| 581 |
> |
dtype = DTfloat; |
| 582 |
> |
#endif |
| 583 |
> |
} else if (dtype == DTrgbe && (rm->dtype == DTxyze || |
| 584 |
|
findCIEprims(rm->info))) |
| 585 |
|
dtype = DTxyze; |
| 586 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
| 758 |
|
int |
| 759 |
|
rmx_transpose(RMATRIX *rm) |
| 760 |
|
{ |
| 761 |
< |
RMATRIX dnew; |
| 762 |
< |
int i, j; |
| 761 |
> |
uby8 *bmap; |
| 762 |
> |
rmx_dtype val[MAXCOMP]; |
| 763 |
> |
RMATRIX dold; |
| 764 |
> |
int i, j; |
| 765 |
|
|
| 766 |
|
if (!rm || !rm->mtx | (rm->ncomp > MAXCOMP)) |
| 767 |
|
return(0); |
| 774 |
|
return(1); |
| 775 |
|
} |
| 776 |
|
if (rm->nrows == rm->ncols) { /* square matrix case */ |
| 777 |
< |
rmx_dtype val[MAXCOMP]; |
| 778 |
< |
for (j = rm->ncols; j--; ) |
| 779 |
< |
for (i = rm->nrows; i--; ) { |
| 780 |
< |
if (i == j) continue; |
| 775 |
< |
memcpy(val, rmx_val(rm,i,j), |
| 777 |
> |
for (i = rm->nrows; i--; ) |
| 778 |
> |
for (j = rm->ncols; j--; ) { |
| 779 |
> |
if (i == j) continue; |
| 780 |
> |
memcpy(val, rmx_val(rm,i,j), |
| 781 |
|
sizeof(rmx_dtype)*rm->ncomp); |
| 782 |
< |
memcpy(rmx_lval(rm,i,j), rmx_val(rm,j,i), |
| 782 |
> |
memcpy(rmx_lval(rm,i,j), rmx_val(rm,j,i), |
| 783 |
|
sizeof(rmx_dtype)*rm->ncomp); |
| 784 |
< |
memcpy(rmx_val(rm,j,i), val, |
| 784 |
> |
memcpy(rmx_val(rm,j,i), val, |
| 785 |
|
sizeof(rmx_dtype)*rm->ncomp); |
| 786 |
< |
} |
| 786 |
> |
} |
| 787 |
|
return(1); |
| 788 |
|
} |
| 789 |
< |
memset(&dnew, 0, sizeof(dnew)); |
| 790 |
< |
dnew.ncols = rm->nrows; dnew.nrows = rm->ncols; |
| 791 |
< |
dnew.ncomp = rm->ncomp; |
| 792 |
< |
if (!rmx_prepare(&dnew)) |
| 789 |
> |
#define bmbyte(r,c) bmap[((r)*rm->ncols+(c))>>3] |
| 790 |
> |
#define bmbit(r,c) (1 << ((r)*rm->ncols+(c) & 7)) |
| 791 |
> |
#define bmop(r,c, op) (bmbyte(r,c) op bmbit(r,c)) |
| 792 |
> |
#define bmtest(r,c) bmop(r,c,&) |
| 793 |
> |
#define bmset(r,c) bmop(r,c,|=) |
| 794 |
> |
/* create completion bitmap */ |
| 795 |
> |
bmap = (uby8 *)calloc(((size_t)rm->nrows*rm->ncols+7)>>3, 1); |
| 796 |
> |
if (!bmap) |
| 797 |
|
return(0); |
| 798 |
< |
rmx_addinfo(&dnew, rm->info); |
| 799 |
< |
dnew.dtype = rm->dtype; |
| 800 |
< |
copycolor(dnew.cexp, rm->cexp); |
| 801 |
< |
memcpy(dnew.wlpart, rm->wlpart, sizeof(dnew.wlpart)); |
| 802 |
< |
for (j = dnew.ncols; j--; ) |
| 803 |
< |
for (i = dnew.nrows; i--; ) |
| 804 |
< |
memcpy(rmx_lval(&dnew,i,j), rmx_val(rm,j,i), |
| 805 |
< |
sizeof(rmx_dtype)*dnew.ncomp); |
| 806 |
< |
/* and reassign result */ |
| 807 |
< |
return(rmx_transfer_data(rm, &dnew, 1)); |
| 798 |
> |
dold = *rm; |
| 799 |
> |
rm->ncols = dold.nrows; rm->nrows = dold.ncols; |
| 800 |
> |
for (i = rm->nrows; i--; ) |
| 801 |
> |
for (j = rm->ncols; j--; ) { |
| 802 |
> |
int i0, j0; |
| 803 |
> |
int i1 = i; |
| 804 |
> |
size_t j1 = j; |
| 805 |
> |
if (bmtest(i, j)) |
| 806 |
> |
continue; |
| 807 |
> |
memcpy(val, rmx_val(rm,i,j), |
| 808 |
> |
sizeof(rmx_dtype)*rm->ncomp); |
| 809 |
> |
bmset(i, j); |
| 810 |
> |
for ( ; ; ) { /* value transpose loop */ |
| 811 |
> |
const rmx_dtype *ds; |
| 812 |
> |
i0 = i1; j0 = j1; |
| 813 |
> |
ds = rmx_val(&dold, j0, i0); |
| 814 |
> |
j1 = (ds - dold.mtx)/dold.ncomp; |
| 815 |
> |
i1 = j1 / rm->ncols; |
| 816 |
> |
j1 -= (size_t)i1*rm->ncols; |
| 817 |
> |
if ((i1 == i) & (j1 == j)) |
| 818 |
> |
break; /* back to start */ |
| 819 |
> |
memcpy(rmx_lval(rm,i0,j0), ds, |
| 820 |
> |
sizeof(rmx_dtype)*rm->ncomp); |
| 821 |
> |
bmset(i1, j1); |
| 822 |
> |
} /* complete the loop */ |
| 823 |
> |
memcpy(rmx_lval(rm,i0,j0), val, |
| 824 |
> |
sizeof(rmx_dtype)*rm->ncomp); |
| 825 |
> |
} |
| 826 |
> |
free(bmap); /* all done! */ |
| 827 |
> |
return(1); |
| 828 |
> |
#undef bmbyte |
| 829 |
> |
#undef bmbit |
| 830 |
> |
#undef bmop |
| 831 |
> |
#undef bmtest |
| 832 |
> |
#undef bmset |
| 833 |
|
} |
| 834 |
|
|
| 835 |
|
/* Multiply (concatenate) two matrices and allocate the result */ |
| 1066 |
|
case 1: |
| 1067 |
|
setcolor(cv, dp[0], dp[0], dp[0]); |
| 1068 |
|
break; |
| 1069 |
< |
default: { |
| 1069 |
> |
default: |
| 1070 |
> |
if (sizeof(COLORV) == sizeof(rmx_dtype)) { |
| 1071 |
> |
scolor2color(cv, (const COLORV *)dp, |
| 1072 |
> |
rm->ncomp, rm->wlpart); |
| 1073 |
> |
} else { |
| 1074 |
|
COLORV scol[MAXCOMP]; |
| 1075 |
< |
int k; |
| 1076 |
< |
for (k = rm->ncomp; k--; ) |
| 1039 |
< |
scol[k] = dp[k]; |
| 1075 |
> |
int k = rm->ncomp; |
| 1076 |
> |
while (k--) scol[k] = dp[k]; |
| 1077 |
|
scolor2color(cv, scol, rm->ncomp, rm->wlpart); |
| 1078 |
< |
} break; |
| 1078 |
> |
} |
| 1079 |
> |
break; |
| 1080 |
|
} |
| 1081 |
|
} |
| 1082 |
|
} |
