--- ray/src/util/cmatrix.h 2018/10/31 22:19:57 2.8 +++ ray/src/util/cmatrix.h 2019/08/14 18:20:02 2.10 @@ -1,4 +1,4 @@ -/* RCSid $Id: cmatrix.h,v 2.8 2018/10/31 22:19:57 greg Exp $ */ +/* RCSid $Id: cmatrix.h,v 2.10 2019/08/14 18:20:02 greg Exp $ */ /* * Color matrix routine declarations. * @@ -42,16 +42,13 @@ extern CMATRIX *cm_resize(CMATRIX *cm, int nrows); #define cm_free(cm) free(cm) /* Load header to obtain/check data type and matrix dimensions */ -extern char *cm_getheader(int *dt, int *nr, int *nc, FILE *fp); +extern char *cm_getheader(int *dt, int *nr, int *nc, int *swp, FILE *fp); /* Allocate and load a matrix from the given input (or stdin if NULL) */ extern CMATRIX *cm_load(const char *inspec, int nrows, int ncols, int dtype); /* Extract a column vector from a matrix */ extern CMATRIX *cm_column(const CMATRIX *cm, int c); - -/* Scale a matrix by a single value */ -extern CMATRIX *cm_scale(const CMATRIX *cm1, const COLOR sca); /* Multiply two matrices (or a matrix and a vector) and allocate the result */ extern CMATRIX *cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2);