--- ray/src/common/color.h 2011/05/20 02:06:38 2.31 +++ ray/src/common/color.h 2013/02/04 03:42:13 2.32 @@ -1,4 +1,4 @@ -/* RCSid $Id: color.h,v 2.31 2011/05/20 02:06:38 greg Exp $ */ +/* RCSid $Id: color.h,v 2.32 2013/02/04 03:42:13 greg Exp $ */ /* * color.h - header for routines using pixel color values. * @@ -156,12 +156,12 @@ typedef float COLORMAT[3][3]; /* color coordinate con #define PRIMARYSTR "PRIMARIES=" #define LPRIMARYSTR 10 #define isprims(hl) (!strncmp(hl,PRIMARYSTR,LPRIMARYSTR)) -#define primsval(p,hl) sscanf((hl)+LPRIMARYSTR, \ +#define primsval(p,hl) (sscanf((hl)+LPRIMARYSTR, \ "%f %f %f %f %f %f %f %f", \ &(p)[RED][CIEX],&(p)[RED][CIEY], \ &(p)[GRN][CIEX],&(p)[GRN][CIEY], \ &(p)[BLU][CIEX],&(p)[BLU][CIEY], \ - &(p)[WHT][CIEX],&(p)[WHT][CIEY]) + &(p)[WHT][CIEX],&(p)[WHT][CIEY]) == 8) #define fputprims(p,fp) fprintf(fp, \ "%s %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\n",\ PRIMARYSTR, \