--- ray/src/util/glareval.c	1991/11/12 17:19:21	2.1
+++ ray/src/util/glareval.c	1998/10/27 08:47:18	2.5
@@ -41,6 +41,8 @@ static int	maxpix;		/* maximum number of pixels to buf
 static SCAN	*freelist;		/* scanline free list */
 static SCAN	*hashtab[HSIZE];	/* scanline hash table */
 
+static long	scanbufsiz;		/* size of allocated scanline buffer */
+
 static long	ncall = 0L;	/* number of calls to getpictscan */
 static long	nread = 0L;	/* number of scanlines read */
 static long	nrecl = 0L;	/* number of scanlines reclaimed */
@@ -263,8 +265,8 @@ int	np;
 				progname, np);
 #endif
 	bzero(pb+6*np, 6*sizeof(float));
-	if (process(rt_pd, pb, pb, 3*sizeof(float)*np,
-			6*sizeof(float)*(np+1)) < 3*sizeof(float)*np) {
+	if (process(rt_pd, pb, pb, 3*sizeof(float)*(np+1),
+			6*sizeof(float)*(np+1)) < 3*sizeof(float)*(np+1)) {
 		fprintf(stderr, "%s: rtrace communication error\n",
 				progname);
 		exit(1);
@@ -272,6 +274,7 @@ int	np;
 }
 
 
+int
 getexpos(s)			/* get exposure from header line */
 char	*s;
 {
@@ -283,6 +286,7 @@ char	*s;
 		formatval(fmt, s);
 		wrongformat = strcmp(fmt, COLRFMT);
 	}
+	return(0);
 }
 
 
@@ -290,7 +294,7 @@ open_pict(fn)			/* open picture file */
 char	*fn;
 {
 	if ((pictfp = fopen(fn, "r")) == NULL) {
-		fprintf("%s: cannot open\n", fn);
+		fprintf(stderr, "%s: cannot open\n", fn);
 		exit(1);
 	}
 	exposure = 1.0;
@@ -398,7 +402,7 @@ initscans()				/* initialize scanline buffers */
 	register SCAN	*ptr;
 	register int	i;
 					/* initialize positions */
-	scanpos = (long *)malloc(pysiz*sizeof(long));
+	scanpos = (long *)bmalloc(pysiz*sizeof(long));
 	if (scanpos == NULL)
 		memerr("scanline positions");
 	for (i = pysiz-1; i >= 0; i--)
@@ -415,7 +419,8 @@ initscans()				/* initialize scanline buffers */
 	i = MAXSBUF / scansize;		/* compute number to allocate */
 	if (i > HSIZE)
 		i = HSIZE;
-	scan_buf = malloc(i*scansize);	/* get in one big chunk */
+	scanbufsiz = i*scansize;
+	scan_buf = bmalloc(scanbufsiz);	/* get in one big chunk */
 	if (scan_buf == NULL)
 		memerr("scanline buffers");
 	ptr = (SCAN *)scan_buf;
@@ -432,6 +437,6 @@ initscans()				/* initialize scanline buffers */
 
 donescans()				/* free up scanlines */
 {
-	free(scan_buf);
-	free((char *)scanpos);
+	bfree(scan_buf, scanbufsiz);
+	bfree((char *)scanpos, pysiz*sizeof(long));
 }