--- ray/src/cv/bsdfrep.h 2014/03/08 06:37:59 2.14 +++ ray/src/cv/bsdfrep.h 2014/03/08 18:16:49 2.15 @@ -1,4 +1,4 @@ -/* RCSid $Id: bsdfrep.h,v 2.14 2014/03/08 06:37:59 greg Exp $ */ +/* RCSid $Id: bsdfrep.h,v 2.15 2014/03/08 18:16:49 greg Exp $ */ /* * Definitions for BSDF representation used to interpolate measured data. * @@ -16,9 +16,12 @@ #define ANG2R(r) (int)((r)*((1<<16)/M_PI)) #define R2ANG(c) (((c)+.5)*(M_PI/(1<<16))) -typedef struct { - float vsum; /* DSF sum */ - unsigned int nval; /* number of values in sum */ +typedef union { + struct { + float v; /* DSF sum */ + unsigned int n; /* number of values in sum */ + } sum; /* sum for averaging */ + float val[2]; /* comparison values */ } GRIDVAL; /* grid value */ typedef struct {