--- ray/src/util/cmatrix.h 2014/01/20 21:29:04 2.1 +++ ray/src/util/cmatrix.h 2014/01/20 22:18:29 2.3 @@ -1,4 +1,4 @@ -/* RCSid $Id: cmatrix.h,v 2.1 2014/01/20 21:29:04 greg Exp $ */ +/* RCSid $Id: cmatrix.h,v 2.3 2014/01/20 22:18:29 greg Exp $ */ /* * Color matrix routine declarations. * @@ -38,7 +38,7 @@ extern CMATRIX *cm_resize(CMATRIX *cm, int nrows); #define cm_free(cm) free(cm) /* Load header to obtain data type */ -int getDTfromHeader(FILE *fp); +extern int getDTfromHeader(FILE *fp); /* Allocate and load a matrix from the given file (or stdin if NULL) */ extern CMATRIX *cm_load(const char *fname, int nrows, int ncols, int dtype); @@ -55,8 +55,8 @@ extern CMATRIX *cm_multiply(const CMATRIX *cm1, const /* print out matrix as ASCII text -- no header */ extern void cm_print(const CMATRIX *cm, FILE *fp); -/* Load and convert a matrix BSDF from the given XML file */ -extern CMATRIX *cm_loadBSDF(char *fname, COLOR cLamb); +/* Load and convert a matrix BTDF from the given XML file */ +extern CMATRIX *cm_loadBTDF(char *fname); #ifdef __cplusplus }