--- ray/src/px/ximage.c	1992/06/24 09:17:43	2.5
+++ ray/src/px/ximage.c	1998/10/27 09:08:28	2.8
@@ -103,7 +103,7 @@ char  *argv[];
 	int  i;
 	
 	progname = argv[0];
-	if ((gv = getenv("GAMMA")) != NULL)
+	if ((gv = getenv("DISPLAY_GAMMA")) != NULL)
 		gamcor = atof(gv);
 
 	for (i = 1; i < argc; i++)
@@ -171,6 +171,7 @@ userr:
 }
 
 
+int
 headline(s)		/* get relevant info from header */
 char  *s;
 {
@@ -183,6 +184,7 @@ char  *s;
 		wrongformat = strcmp(fmt, COLRFMT);
 	} else if (isview(s) && sscanview(&ourview, s) > 0)
 		gotview++;
+	return(0);
 }
 
 
@@ -644,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)