10 |
|
#include <string.h> |
11 |
|
#include <fcntl.h> |
12 |
|
#include "resolu.h" |
13 |
+ |
#include "rtprocess.h" |
14 |
|
#include "rmatrix.h" |
15 |
|
|
16 |
|
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
47 |
|
int |
48 |
|
rmx_newtype(int dtyp1, int dtyp2) |
49 |
|
{ |
50 |
< |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2) |
50 |
> |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | |
51 |
> |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) |
52 |
> |
&& dtyp1 != dtyp2) |
53 |
|
return(0); |
54 |
|
if (dtyp1 < dtyp2) |
55 |
|
return(dtyp1); |
514 |
|
for (k = mres->ncomp; k--; ) { |
515 |
|
long double d = 0; |
516 |
|
for (h = m1->ncols; h--; ) |
517 |
< |
d += (long double)rmx_lval(m1,i,h,k) * |
515 |
< |
(long double)rmx_lval(m2,h,j,k); |
517 |
> |
d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k); |
518 |
|
rmx_lval(mres,i,j,k) = (double)d; |
519 |
|
} |
520 |
|
return(mres); |