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