--- ray/src/px/x11image.c	1998/02/09 14:37:09	2.51
+++ ray/src/px/x11image.c	2004/09/28 17:54:18	2.68
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char RCSid[] = "$Id: x11image.c,v 2.68 2004/09/28 17:54:18 greg Exp $";
 #endif
-
 /*
  *  x11image.c - driver for X-windows
  *
@@ -21,24 +18,23 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #include  "standard.h"
 
+#include  <string.h>
 #include  <signal.h>
+#include  <unistd.h>
+#include  <sys/types.h>
+#include  <sys/wait.h>
 #include  <X11/Xlib.h>
 #include  <X11/cursorfont.h>
 #include  <X11/Xutil.h>
 #include  <X11/Xatom.h>
 
-#undef	NOPROTO
-#define	NOPROTO 1
+#include  "color.h"
 #include  "tonemap.h"
+#include  "clrtab.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)-'@')
@@ -94,7 +90,7 @@ RESOLU  inpres;				/* input resolution and ordering */
 int  xmax, ymax;			/* picture dimensions */
 int  width, height;			/* window size */
 char  *fname = NULL;			/* input file name */
-FILE  *fin = stdin;			/* input file */
+FILE  *fin = NULL;			/* input file */
 long  *scanpos = NULL;			/* scan line positions in file */
 int  cury = 0;				/* current scan location */
 
@@ -112,7 +108,7 @@ unsigned char	*ourdata;		/* our image data */
 
 struct {
 	int  xmin, ymin, xsiz, ysiz;
-}  box = {0, 0, 0, 0};			/* current box */
+}  bbox = {0, 0, 0, 0};			/* current bbox */
 
 char  *geometry = NULL;			/* geometry specification */
 
@@ -125,27 +121,52 @@ char  errmsg[128];
 
 BYTE  clrtab[256][3];			/* global color map */
 
-extern long  ftell();
 
-extern char  *getenv();
-
 Display  *thedisplay;
 Atom  closedownAtom, wmProtocolsAtom;
 
 int  sigrecv;
 
-int  onsig() { sigrecv++; }
+void  onsig(int i) { sigrecv++; }
 
+typedef void doboxf_t(COLR *scn, int n, void *);
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+static gethfunc headline;
+static void init(int argc, char **argv);
+static void quiterr(char *err);
+static int viscmp(XVisualInfo *v1, XVisualInfo *v2);
+static void getbestvis(void);
+static void getras(void);
+static void getevent(void);
+static int traceray(int xpos, int ypos);
+static int docom(XKeyPressedEvent *ekey);
+static void moveimage(XButtonPressedEvent *ebut);
+static void getbox(XButtonPressedEvent *ebut);
+static void trackrays(XButtonPressedEvent *ebut);
+static void revbox(int x0, int y0, int x1, int y1);
+static doboxf_t colavg;
+static doboxf_t addfix;
+static int avgbox(COLOR cavg);
+static int dobox(doboxf_t *f, void *p);
+static void make_tonemap(void);
+static void tmap_colrs(COLR *scn, int len);
+static void getmono(void);
+static void add2icon(int y, COLR *scan);
+static void getfull(void);
+static void getgrey(void);
+static void getmapped(void);
+static void scale_rcolors(XRASTER *xr, double sf);
+static int getscan(int y);
+
+
+int
+main(int  argc, char  *argv[])
 {
-	int  headline();
 	int  i;
 	int  pid;
 	
 	progname = argv[0];
+	fin = stdin;
 
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
@@ -253,8 +274,11 @@ userr:
 }
 
 
-headline(s)		/* get relevant info from header */
-char  *s;
+static int
+headline(		/* get relevant info from header */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -264,12 +288,15 @@ char  *s;
 		wrongformat = strcmp(fmt, COLRFMT);
 	else if (isview(s) && sscanview(&ourview, s) > 0)
 		gotview++;
+	return(0);
 }
 
 
-init(argc, argv)			/* get data and open window */
-int argc;
-char **argv;
+static void
+init(			/* get data and open window */
+	int argc,
+	char **argv
+)
 {
 	XSetWindowAttributes	ourwinattr;
 	XClassHint	xclshints;
@@ -383,18 +410,20 @@ char **argv;
 } /* end of init */
 
 
-quiterr(err)		/* print message and exit */
-char  *err;
+static void
+quiterr(		/* print message and exit */
+	char  *err
+)
 {
 	register int  es;
 	int  cs;
 
-	if (es = err != NULL)
+	if ( (es = err != NULL) )
 		fprintf(stderr, "%s: %s: %s\n", progname, 
 				fname==NULL?"<stdin>":fname, err);
 	if (thedisplay != NULL)
 		XCloseDisplay(thedisplay);
-	if (parent < 0 & sigrecv == 0)
+	if ((parent < 0) & (sigrecv == 0))
 		kill(getppid(), SIGCONT);
 	while (parent > 0 && wait(&cs) != -1) {	/* wait for any children */
 		if (es == 0)
@@ -406,8 +435,10 @@ char  *err;
 
 
 static int
-viscmp(v1,v2)		/* compare visual to see which is better, descending */
-register XVisualInfo	*v1, *v2;
+viscmp(		/* compare visual to see which is better, descending */
+	register XVisualInfo	*v1,
+	register XVisualInfo	*v2
+)
 {
 	int	bad1 = 0, bad2 = 0;
 	register int  *rp;
@@ -419,19 +450,20 @@ register XVisualInfo	*v1, *v2;
 				return(-1);
 			if (v1->depth == 32 && v2->depth == 24)
 				return(1);
-			return(0);
+					/* go for maximum depth otherwise */
+			return(v2->depth - v1->depth);
 		}
 					/* don't be too greedy */
 		if (maxcolors <= 1<<v1->depth && maxcolors <= 1<<v2->depth)
 			return(v1->depth - v2->depth);
 		return(v2->depth - v1->depth);
 	}
-					/* prefer Pseudo when < 24-bit */
+					/* prefer Pseudo when < 15-bit */
 	if ((v1->class == TrueColor || v1->class == DirectColor) &&
-			v1->depth < 24)
+			v1->depth < 15)
 		bad1 = 1;
 	if ((v2->class == TrueColor || v2->class == DirectColor) &&
-			v2->depth < 24)
+			v2->depth < 15)
 		bad2 = -1;
 	if (bad1 | bad2)
 		return(bad1+bad2);
@@ -446,7 +478,8 @@ register XVisualInfo	*v1, *v2;
 }
 
 
-getbestvis()			/* get the best visual for this screen */
+static void
+getbestvis(void)			/* get the best visual for this screen */
 {
 #ifdef DEBUG
 static char  vistype[][12] = {
@@ -498,7 +531,7 @@ static char  vistype[][12] = {
 	if (viscmp(&xvi[i],&ourvis) > 0)
 		quiterr("inadequate visuals on this screen");
 					/* OK, we'll use it */
-	copystruct(&ourvis, &xvi[i]);
+	ourvis = xvi[i];
 #ifdef DEBUG
 	fprintf(stderr, "Selected visual type %s, depth %d\n",
 			vistype[ourvis.class], ourvis.depth);
@@ -528,10 +561,9 @@ static char  vistype[][12] = {
 }
 
 
-getras()				/* get raster file */
+static void
+getras(void)				/* get raster file */
 {
-	XVisualInfo	vinfo;
-
 	if (maxcolors <= 2) {		/* monochrome */
 		ourdata = (unsigned char *)malloc(ymax*((xmax+7)/8));
 		if (ourdata == NULL)
@@ -541,12 +573,13 @@ getras()				/* get raster file */
 		if (ourras == NULL)
 			goto fail;
 		getmono();
-	} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) {
-		ourdata = (unsigned char *)malloc(sizeof(int4)*xmax*ymax);
+	} else if ((ourvis.class == TrueColor) | (ourvis.class == DirectColor)) {
+		int  datsiz = ourvis.depth>16 ? sizeof(int32) : sizeof(int16);
+		ourdata = (unsigned char *)malloc(datsiz*xmax*ymax);
 		if (ourdata == NULL)
 			goto fail;
-		ourras = make_raster(thedisplay, &ourvis, sizeof(int4)*8,
-				ourdata, xmax, ymax, 32);
+		ourras = make_raster(thedisplay, &ourvis, datsiz*8,
+				ourdata, xmax, ymax, datsiz*8);
 		if (ourras == NULL)
 			goto fail;
 		getfull();
@@ -571,7 +604,8 @@ fail:
 }
 
 
-getevent()				/* process the next event */
+static void
+getevent(void)				/* process the next event */
 {
 	XEvent xev;
 
@@ -588,7 +622,7 @@ getevent()				/* process the next event */
 		map_rcolors(ourras, wind);
 		if (fast)
 			make_rpixmap(ourras, wind);
-		if (!sequential & parent < 0 & sigrecv == 0) {
+		if ((!sequential) & (parent < 0) & (sigrecv == 0)) {
 			kill(getppid(), SIGCONT);
 			sigrecv--;
 		}
@@ -626,17 +660,19 @@ getevent()				/* process the next event */
 }
 
 
-traceray(xpos, ypos)			/* print requested pixel data */
-int  xpos, ypos;
+static int
+traceray(			/* print requested pixel data */
+	int  xpos,
+	int  ypos
+)
 {
-	extern char  *index();
-	FLOAT  hv[2];
+	RREAL  hv[2];
 	FVECT  rorg, rdir;
 	COLOR  cval;
 	register char  *cp;
 
-	box.xmin = xpos; box.xsiz = 1;
-	box.ymin = ypos; box.ysiz = 1;
+	bbox.xmin = xpos; bbox.xsiz = 1;
+	bbox.ymin = ypos; bbox.ysiz = 1;
 	avgbox(cval);
 	scalecolor(cval, 1./exposure);
 	pix2loc(hv, &inpres, xpos-xoff, ypos-yoff);
@@ -670,15 +706,17 @@ int  xpos, ypos;
 }
 
 
-docom(ekey)				/* execute command */
-XKeyPressedEvent  *ekey;
+static int
+docom(				/* execute command */
+	XKeyPressedEvent  *ekey
+)
 {
 	char  buf[80];
 	COLOR  cval;
 	XColor  cvx;
 	int  com, n;
 	double  comp;
-	FLOAT  hv[2];
+	RREAL  hv[2];
 
 	n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); 
 	if (n == 0)
@@ -701,7 +739,7 @@ XKeyPressedEvent  *ekey;
 			sprintf(buf, "%.3f", intens(cval)/exposure);
 			break;
 		case 'l':				/* luminance */
-			sprintf(buf, "%.0fL", luminance(cval)/exposure);
+			sprintf(buf, "%.1fL", luminance(cval)/exposure);
 			break;
 		case 'c':				/* color */
 			comp = pow(2.0, (double)scale);
@@ -712,7 +750,7 @@ XKeyPressedEvent  *ekey;
 			break;
 		}
 		XDrawImageString(thedisplay, wind, ourgc,
-				box.xmin, box.ymin+box.ysiz, buf, strlen(buf)); 
+				bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf)); 
 		return(0);
 	case 'i':				/* identify (contour) */
 		if (ourras->pixels == NULL)
@@ -774,9 +812,9 @@ XKeyPressedEvent  *ekey;
 		sprintf(buf, "%+d", scale);
 	remap:
 		XDrawImageString(thedisplay, wind, ourgc,
-				box.xmin, box.ymin+box.ysiz, buf, strlen(buf));
+				bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf));
 		XFlush(thedisplay);
-		free(ourdata);
+		/* free(ourdata); 	This is done in XDestroyImage()! */
 		free_raster(ourras);
 		getras();
 	/* fall through */
@@ -798,14 +836,14 @@ XKeyPressedEvent  *ekey;
 		free_rpixmap(ourras);
 		return(0);
 	case '0':				/* recenter origin */
-		if (xoff == 0 & yoff == 0)
+		if ((xoff == 0) & (yoff == 0))
 			return(0);
 		xoff = yoff = 0;
 		XClearWindow(thedisplay, wind);
 		redraw(0, 0, width, height);
 		return(0);
 	case ' ':				/* clear */
-		redraw(box.xmin, box.ymin, box.xsiz, box.ysiz);
+		redraw(bbox.xmin, bbox.ymin, bbox.xsiz, bbox.ysiz);
 		return(0);
 	default:
 		XBell(thedisplay, 0);
@@ -814,8 +852,10 @@ XKeyPressedEvent  *ekey;
 }
 
 
-moveimage(ebut)				/* shift the image */
-XButtonPressedEvent  *ebut;
+static void
+moveimage(				/* shift the image */
+	XButtonPressedEvent  *ebut
+)
 {
 	XEvent	e;
 	int	mxo, myo;
@@ -839,36 +879,40 @@ XButtonPressedEvent  *ebut;
 }
 
 
-getbox(ebut)				/* get new box */
-XButtonPressedEvent  *ebut;
+static void
+getbox(				/* get new bbox */
+	XButtonPressedEvent  *ebut
+)
 {
 	XEvent	e;
 
 	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
 	while (e.type == MotionNotify) {
-		revbox(ebut->x, ebut->y, box.xmin = e.xmotion.x, box.ymin = e.xmotion.y);
+		revbox(ebut->x, ebut->y, bbox.xmin = e.xmotion.x, bbox.ymin = e.xmotion.y);
 		XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
-		revbox(ebut->x, ebut->y, box.xmin, box.ymin);
+		revbox(ebut->x, ebut->y, bbox.xmin, bbox.ymin);
 	}
-	box.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x);
-	box.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y);
-	if (box.xmin > ebut->x) {
-		box.xsiz = box.xmin - ebut->x + 1;
-		box.xmin = ebut->x;
+	bbox.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x);
+	bbox.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y);
+	if (bbox.xmin > ebut->x) {
+		bbox.xsiz = bbox.xmin - ebut->x + 1;
+		bbox.xmin = ebut->x;
 	} else {
-		box.xsiz = ebut->x - box.xmin + 1;
+		bbox.xsiz = ebut->x - bbox.xmin + 1;
 	}
-	if (box.ymin > ebut->y) {
-		box.ysiz = box.ymin - ebut->y + 1;
-		box.ymin = ebut->y;
+	if (bbox.ymin > ebut->y) {
+		bbox.ysiz = bbox.ymin - ebut->y + 1;
+		bbox.ymin = ebut->y;
 	} else {
-		box.ysiz = ebut->y - box.ymin + 1;
+		bbox.ysiz = ebut->y - bbox.ymin + 1;
 	}
 }
 
 
-trackrays(ebut)				/* trace rays as mouse moves */
-XButtonPressedEvent  *ebut;
+static void
+trackrays(				/* trace rays as mouse moves */
+	XButtonPressedEvent  *ebut
+)
 {
 	XEvent	e;
 	unsigned long	lastrept;
@@ -886,8 +930,13 @@ XButtonPressedEvent  *ebut;
 }
 
 
-revbox(x0, y0, x1, y1)			/* draw box with reversed lines */
-int  x0, y0, x1, y1;
+static void
+revbox(			/* draw bbox with reversed lines */
+	int  x0,
+	int  y0,
+	int  x1,
+	int  y1
+)
 {
 	revline(x0, y0, x1, y0);
 	revline(x0, y1, x1, y1);
@@ -896,24 +945,26 @@ int  x0, y0, x1, y1;
 }
 
 
-int
-colavg(scn, n, cavg)
-register COLR	*scn;
-register int	n;
-COLOR	cavg;
+static void
+colavg(
+	register COLR	*scn,
+	register int	n,
+	void *cavg
+)
 {
 	COLOR	col;
 
 	while (n--) {
-		colr_color(col, scn++);
-		addcolor(cavg, col);
+		colr_color(col, *scn++);
+		addcolor((COLORV*)cavg, col);
 	}
 }
 
 
-int
-avgbox(cavg)				/* average color over current box */
-COLOR	cavg;
+static int
+avgbox(				/* average color over current bbox */
+	COLOR	cavg
+)
 {
 	double	d;
 	register int	rval;
@@ -928,24 +979,26 @@ COLOR	cavg;
 }
 
 
-int
-dobox(f, p)				/* run function over box */
-int	(*f)();			/* function to call for each subscan */
-char	*p;			/* pointer to private data */
+static int
+dobox(				/* run function over bbox */
+	//void	(*f)(),			/* function to call for each subscan */
+	doboxf_t *f,			/* function to call for each subscan */
+	void	*p			/* pointer to private data */
+)
 {
 	int  left, right, top, bottom;
 	int  y;
 
-	left = box.xmin - xoff;
-	right = left + box.xsiz;
+	left = bbox.xmin - xoff;
+	right = left + bbox.xsiz;
 	if (left < 0)
 		left = 0;
 	if (right > xmax)
 		right = xmax;
 	if (left >= right)
 		return(0);
-	top = box.ymin - yoff;
-	bottom = top + box.ysiz;
+	top = bbox.ymin - yoff;
+	bottom = top + bbox.ysiz;
 	if (top < 0)
 		top = 0;
 	if (bottom > ymax)
@@ -961,10 +1014,12 @@ char	*p;			/* pointer to private data */
 }
 
 
-int
-addfix(scn, n)			/* add fixation points to histogram */
-COLR	*scn;
-int	n;
+static void
+addfix(			/* add fixation points to histogram */
+	COLR	*scn,
+	int	n,
+	void	*p  /*NOTUSED*/
+)
 {
 	if (tmCvColrs(lscan, TM_NOCHROM, scn, n))
 		goto tmerr;
@@ -976,7 +1031,8 @@ tmerr:
 }
 
 
-make_tonemap()			/* initialize tone mapping */
+static void
+make_tonemap(void)			/* initialize tone mapping */
 {
 	int  flags, y;
 
@@ -1031,9 +1087,11 @@ tmerr:
 }
 
 
-tmap_colrs(scn, len)		/* apply tone mapping to scanline */
-register COLR  *scn;
-int  len;
+static void
+tmap_colrs(		/* apply tone mapping to scanline */
+	register COLR  *scn,
+	int  len
+)
 {
 	register BYTE  *ps;
 
@@ -1070,7 +1128,8 @@ tmerr:
 }
 
 
-getmono()			/* get monochrome data */
+static void
+getmono(void)			/* get monochrome data */
 {
 	register unsigned char	*dp;
 	register int	x, err;
@@ -1098,13 +1157,15 @@ getmono()			/* get monochrome data */
 			cerr[x] = err + errp;
 		}
 	}
-	free((char *)cerr);
+	free((void *)cerr);
 }
 
 
-add2icon(y, scan)		/* add a scanline to our icon data */
-int  y;
-COLR  *scan;
+static void
+add2icon(		/* add a scanline to our icon data */
+	int  y,
+	COLR  *scan
+)
 {
 	static short  cerr[ICONSIZ];
 	static int  ynext;
@@ -1141,7 +1202,7 @@ COLR  *scan;
 		errp = err;
 		ti = x*xmax/iconwidth;
 		copycolr(clr, scan[ti]);
-		normcolrs(clr, 1, scale);
+		normcolrs(&clr, 1, scale);
 		err += normbright(clr) + cerr[x];
 		if (err > 127)
 			err -= 255;
@@ -1154,34 +1215,76 @@ COLR  *scan;
 }
 
 
-getfull()			/* get full (24-bit) data */
+static void
+getfull(void)			/* get full (24-bit) data */
 {
 	int	y;
-	register unsigned int4	*dp;
+	register uint32	*dp;
+	register uint16	*dph;
 	register int	x;
 					/* initialize tone mapping */
 	make_tonemap();
 					/* read and convert file */
-	dp = (unsigned int4 *)ourdata;
+	dp = (uint32 *)ourdata;
+	dph = (uint16 *)ourdata;
 	for (y = 0; y < ymax; y++) {
 		getscan(y);
 		add2icon(y, scanline);
 		tmap_colrs(scanline, xmax);
-		if (ourras->image->blue_mask & 1)
+		switch (ourras->image->blue_mask) {
+		case 0xff:		/* 24-bit RGB */
 			for (x = 0; x < xmax; x++)
-				*dp++ =	(unsigned int4)scanline[x][RED] << 16 |
-					(unsigned int4)scanline[x][GRN] << 8 |
-					(unsigned int4)scanline[x][BLU] ;
-		else
+				*dp++ =	(uint32)scanline[x][RED] << 16 |
+					(uint32)scanline[x][GRN] << 8 |
+					(uint32)scanline[x][BLU] ;
+			break;
+		case 0xff0000:		/* 24-bit BGR */
 			for (x = 0; x < xmax; x++)
-				*dp++ =	(unsigned int4)scanline[x][RED] |
-					(unsigned int4)scanline[x][GRN] << 8 |
-					(unsigned int4)scanline[x][BLU] << 16 ;
+				*dp++ =	(uint32)scanline[x][RED] |
+					(uint32)scanline[x][GRN] << 8 |
+					(uint32)scanline[x][BLU] << 16 ;
+			break;
+#if 0
+		case 0x1f:		/* 15-bit RGB */
+			for (x = 0; x < xmax; x++)
+				*dph++ =	(scanline[x][RED] << 7 & 0x7c00) |
+					(scanline[x][GRN] << 2 & 0x3e0) |
+					(unsigned)scanline[x][BLU] >> 3 ;
+			break;
+		case 0x7c00:		/* 15-bit BGR */
+			for (x = 0; x < xmax; x++)
+				*dph++ =	(unsigned)scanline[x][RED] >> 3 |
+					(scanline[x][GRN] << 2 & 0x3e0) |
+					(scanline[x][BLU] << 7 & 0x7c00) ;
+			break;
+#endif
+		default:		/* unknown */
+			if (ourvis.depth > 16)
+				for (x = 0; x < xmax; x++) {
+					*dp = ourras->image->red_mask &
+						ourras->image->red_mask*scanline[x][RED]/255;
+					*dp |= ourras->image->green_mask &
+						ourras->image->green_mask*scanline[x][GRN]/255;
+					*dp++ |= ourras->image->blue_mask &
+						ourras->image->blue_mask*scanline[x][BLU]/255;
+				}
+			else
+				for (x = 0; x < xmax; x++) {
+					*dph = ourras->image->red_mask &
+						ourras->image->red_mask*scanline[x][RED]/255;
+					*dph |= ourras->image->green_mask &
+						ourras->image->green_mask*scanline[x][GRN]/255;
+					*dph++ |= ourras->image->blue_mask &
+						ourras->image->blue_mask*scanline[x][BLU]/255;
+				}
+			break;
+		}
 	}
 }
 
 
-getgrey()			/* get greyscale data */
+static void
+getgrey(void)			/* get greyscale data */
 {
 	int	y;
 	register unsigned char	*dp;
@@ -1196,7 +1299,7 @@ getgrey()			/* get greyscale data */
 		tmap_colrs(scanline, xmax);
 		if (maxcolors < 256)
 			for (x = 0; x < xmax; x++)
-				*dp++ =	((int4)scanline[x][GRN] *
+				*dp++ =	((int32)scanline[x][GRN] *
 					maxcolors + maxcolors/2) >> 8;
 		else
 			for (x = 0; x < xmax; x++)
@@ -1204,11 +1307,12 @@ getgrey()			/* get greyscale data */
 	}
 	for (x = 0; x < maxcolors; x++)
 		clrtab[x][RED] = clrtab[x][GRN] =
-			clrtab[x][BLU] = ((int4)x*256 + 128)/maxcolors;
+			clrtab[x][BLU] = ((int32)x*256 + 128)/maxcolors;
 }
 
 
-getmapped()			/* get color-mapped data */
+static void
+getmapped(void)			/* get color-mapped data */
 {
 	int	y;
 					/* make sure we can do it first */
@@ -1217,7 +1321,7 @@ getmapped()			/* get color-mapped data */
 					/* initialize tone mapping */
 	make_tonemap();
 					/* make histogram */
-	if (new_histo((int4)xmax*ymax) == -1)
+	if (new_histo((int32)xmax*ymax) == -1)
 		quiterr("cannot initialize histogram");
 	for (y = 0; y < ymax; y++) {
 		if (getscan(y) < 0)
@@ -1240,9 +1344,11 @@ getmapped()			/* get color-mapped data */
 }
 
 
-scale_rcolors(xr, sf)			/* scale color map */
-register XRASTER	*xr;
-double	sf;
+static void
+scale_rcolors(			/* scale color map */
+	register XRASTER	*xr,
+	double	sf
+)
 {
 	register int	i;
 	long	maxv;
@@ -1268,13 +1374,15 @@ double	sf;
 }
 
 
-getscan(y)
-int  y;
+static int
+getscan(
+	int  y
+)
 {
 	static int  trunced = -1;		/* truncated file? */
 skipit:
 	if (trunced >= 0 && y >= trunced) {
-		bzero(scanline, xmax*sizeof(COLR));
+		memset(scanline, '\0', xmax*sizeof(COLR));
 		return(-1);
 	}
 	if (y != cury) {