--- ray/src/px/ximage.c	1991/12/23 23:20:06	2.3
+++ ray/src/px/ximage.c	1998/10/27 09:08:28	2.8
@@ -97,10 +97,14 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
+	extern char  *getenv();
+	char  *gv;
 	int  headline();
 	int  i;
 	
 	progname = argv[0];
+	if ((gv = getenv("DISPLAY_GAMMA")) != NULL)
+		gamcor = atof(gv);
 
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
@@ -167,11 +171,10 @@ userr:
 }
 
 
+int
 headline(s)		/* get relevant info from header */
 char  *s;
 {
-	static char  *altname[] = {"rview","rpict",VIEWSTR,NULL};
-	register char  **an;
 	char  fmt[32];
 
 	if (isexpos(s))
@@ -179,13 +182,9 @@ char  *s;
 	else if (isformat(s)) {
 		formatval(fmt, s);
 		wrongformat = strcmp(fmt, COLRFMT);
-	} else
-		for (an = altname; *an != NULL; an++)
-			if (!strncmp(*an, s, strlen(*an))) {
-				if (sscanview(&ourview, s+strlen(*an)) > 0)
-					gotview++;
-				return;
-			}
+	} else if (isview(s) && sscanview(&ourview, s) > 0)
+		gotview++;
+	return(0);
 }
 
 
@@ -647,7 +646,7 @@ int  y;
 		if (fseek(fin, scanpos[y], 0) == -1)
 			quiterr("fseek error");
 		cury = y;
-	} else if (scanpos != NULL)
+	} else if (scanpos != NULL && scanpos[y] == -1)
 		scanpos[y] = ftell(fin);
 
 	if (freadcolrs(scanline, xmax, fin) < 0)