14 |
|
|
15 |
|
/* General plane-ordered component matrix */ |
16 |
|
typedef struct { |
17 |
< |
int nrows, ncols, ncomp; |
18 |
< |
int dtype; |
17 |
> |
int nrows, ncols; |
18 |
> |
short ncomp; |
19 |
> |
uby8 dtype; |
20 |
> |
uby8 swapin; |
21 |
|
char *info; |
22 |
|
double mtx[1]; /* extends struct */ |
23 |
|
} RMATRIX; |
24 |
|
|
25 |
< |
#define rmx_lval(rm,r,c,i) (rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))] |
25 |
> |
#define rmx_lval(rm,r,c,i) (rm)->mtx[(i)+(rm)->ncomp*((c)+(size_t)(rm)->ncols*(r))] |
26 |
|
|
27 |
|
/* Allocate a nr x nc matrix with n components */ |
28 |
|
extern RMATRIX *rmx_alloc(int nr, int nc, int n); |