--- ray/src/px/x11image.c	1991/05/02 17:24:54	1.17
+++ ray/src/px/x11image.c	1991/05/03 09:54:31	1.19
@@ -37,7 +37,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define  BORWIDTH	5		/* border width */
 
-#define  ICONSIZ	80		/* maximum icon dimension */
+#define  ICONSIZ	(8*10)		/* maximum icon dimension (even 8) */
 
 #define  ourscreen	DefaultScreen(thedisplay)
 #define  ourblack	BlackPixel(thedisplay,ourscreen)
@@ -92,7 +92,7 @@ struct {
 
 char  *geometry = NULL;			/* geometry specification */
 
-char  icondata[(ICONSIZ+7)/8*ICONSIZ];	/* icon bitmap data */
+char  icondata[ICONSIZ*ICONSIZ/8];	/* icon bitmap data */
 int  iconwidth = 0, iconheight = 0;
 
 char  *progname;
@@ -246,7 +246,6 @@ init()			/* get data and open window */
 	XSetFont(thedisplay, ourgc, fontid);
 	revgc = XCreateGC(thedisplay, wind, 0, 0);
 	XSetFunction(thedisplay, revgc, GXinvert);
-	XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
 	XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay, 
 			XC_diamond_cross));
 	if (geometry != NULL) {
@@ -281,6 +280,8 @@ init()			/* get data and open window */
 			|ButtonMotionMask|StructureNotifyMask
 			|KeyPressMask|ExposureMask);
 	XMapWindow(thedisplay, wind);
+				/* store name last as ready signal */
+	XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
 	return;
 memerr:
 	quiterr("out of memory");
@@ -658,7 +659,7 @@ COLR  *scan;
 	register int	x, xi;
 
 	if (iconheight == 0) {		/* initialize */
-		if (xmax < ICONSIZ && ymax < ICONSIZ) {
+		if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
 			iconwidth = xmax;
 			iconheight = ymax;
 		} else if (xmax > ymax) {
@@ -686,7 +687,7 @@ COLR  *scan;
 			*dp |= 1<<(x&07);
 		cerr[x] = err >>= 1;
 	}
-	if (y >= ymax-ymax/iconheight)	/* all done */
+	if (y >= ymax - ymax/iconheight)	/* all done */
 		dp = NULL;
 }