--- ray/src/common/color.h	1989/10/20 16:45:25	1.3
+++ ray/src/common/color.h	1991/04/18 12:54:22	1.11
@@ -40,8 +40,16 @@ typedef float  COLOR[3];	/* red, green, blue */
 
 #define  multcolor(c1,c2)	((c1)[0]*=(c2)[0],(c1)[1]*=(c2)[1],(c1)[2]*=(c2)[2])
 
-#define  bright(col)		(.30*(col)[RED]+.59*(col)[GRN]+.11*(col)[BLU])
+#ifdef  NTSC
+#define  bright(col)		(.295*(col)[RED]+.636*(col)[GRN]+.070*(col)[BLU])
+#define  normbright(c)		(int)((74L*(c)[RED]+164L*(c)[GRN]+18L*(c)[BLU])/256)
+#else
+#define  bright(col)		(.263*(col)[RED]+.655*(col)[GRN]+.082*(col)[BLU])
+#define  normbright(c)		(int)((67L*(c)[RED]+168L*(c)[GRN]+21L*(c)[BLU])/256)
+#endif
 
+#define  luminance(col)		(470. * bright(col))
+
 #define  intens(col)		( (col)[0] > (col)[1] \
 				? (col)[0] > (col)[2] ? (col)[0] : (col)[2] \
 				: (col)[1] > (col)[2] ? (col)[1] : (col)[2] )
@@ -50,8 +58,6 @@ typedef float  COLOR[3];	/* red, green, blue */
 				ldexp((c)[p]+.5,(int)(c)[EXP]-(COLXS+8)) : \
 				0. )
 
-#define  norm_bright(c)		(int)((77L*(c)[RED]+151L*(c)[GRN]+28L*(c)[BLU])/256)
-
 #define  WHTCOLOR		{1.0,1.0,1.0}
 #define  BLKCOLOR		{0.0,0.0,0.0}
 #define  WHTCOLR		{128,128,128,COLXS+1}
@@ -62,4 +68,30 @@ typedef float  COLOR[3];	/* red, green, blue */
 #define  YDECR			2
 #define  YMAJOR			4
 
-extern double  ldexp();
+				/* picture format identifier */
+#define  COLRFMT		"32-bit_rle_rgbe"
+
+				/* macros for exposures */
+#define  EXPOSSTR		"EXPOSURE="
+#define  EXPOSSTRL		9
+#define  isexpos(hl)		(!strncmp(hl,EXPOSSTR,EXPOSSTRL))
+#define  exposval(hl)		atof((hl)+EXPOSSTRL)
+#define  fputexpos(ex,fp)	fprintf(fp,"%s%e\n",EXPOSSTR,ex)
+
+				/* macros for pixel aspect ratios */
+#define  ASPECTSTR		"PIXASPECT="
+#define  ASPECTSTRL		10
+#define  isaspect(hl)		(!strncmp(hl,ASPECTSTR,ASPECTSTRL))
+#define  aspectval(hl)		atof((hl)+ASPECTSTRL)
+#define  fputaspect(pa,fp)	fprintf(fp,"%s%f\n",ASPECTSTR,pa)
+
+				/* macros for color correction */
+#define  COLCORSTR		"COLORCORR="
+#define  COLCORSTRL		10
+#define  iscolcor(hl)		(!strncmp(hl,COLCORSTR,COLCORSTRL))
+#define  colcorval(cc,hl)	sscanf(hl+COLCORSTRL,"%f %f %f", \
+					&(cc)[RED],&(cc)[GRN],&(cc)[BLU])
+#define  fputcolcor(cc,fp)	fprintf(fp,"%s %f %f %f\n",COLCORSTR, \
+					(cc)[RED],(cc)[GRN],(cc)[BLU])
+
+extern double  ldexp(), atof();