--- ray/src/px/x11image.c	1997/07/31 21:00:57	2.50
+++ ray/src/px/x11image.c	1998/08/17 18:00:11	2.52
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -29,16 +29,13 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #undef	NOPROTO
 #define	NOPROTO 1
+#include  "color.h"
 #include  "tonemap.h"
 #include  "view.h"
 #include  "x11raster.h"
 #include  "random.h"
 #include  "resolu.h"
 
-#ifndef  int4
-#define  int4		int		/* most int's are 32-bit */
-#endif
-
 #define  FONTNAME	"8x13"		/* text font we'll use */
 
 #define  CTRL(c)	((c)-'@')
@@ -736,10 +733,14 @@ XKeyPressedEvent  *ekey;
 	case 't':				/* trace */
 		return(traceray(ekey->x, ekey->y));
 	case 'a':				/* auto exposure */
+		if (fname == NULL)
+			return(-1);
 		tmflags = TM_F_CAMERA;
 		strcpy(buf, "auto exposure...");
 		goto remap;
 	case 'h':				/* human response */
+		if (fname == NULL)
+			return(-1);
 		tmflags = TM_F_HUMAN;
 		strcpy(buf, "human exposure...");
 		goto remap;