--- ray/src/util/rmatrix.h 2019/08/14 18:20:02 2.10 +++ ray/src/util/rmatrix.h 2020/03/25 01:51:09 2.12 @@ -1,4 +1,4 @@ -/* RCSid $Id: rmatrix.h,v 2.10 2019/08/14 18:20:02 greg Exp $ */ +/* RCSid $Id: rmatrix.h,v 2.12 2020/03/25 01:51:09 greg Exp $ */ /* * Header file for general matrix routines. */ @@ -14,11 +14,12 @@ extern "C" { /* General plane-ordered component matrix */ typedef struct { - int nrows, ncols, ncomp; - short dtype; - short swapin; + int nrows, ncols; + short ncomp; + uby8 dtype; + uby8 swapin; char *info; - double mtx[1]; /* extends struct */ + double mtx[3]; /* extends struct */ } RMATRIX; #define rmx_lval(rm,r,c,i) (rm)->mtx[(i)+(rm)->ncomp*((c)+(size_t)(rm)->ncols*(r))]