--- ray/src/util/glareval.c 1992/06/21 17:52:58 2.2 +++ ray/src/util/glareval.c 2003/02/22 02:07:30 2.6 @@ -1,15 +1,11 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: glareval.c,v 2.6 2003/02/22 02:07:30 greg Exp $"; #endif - /* * Compute pixels for glare calculation */ #include "glare.h" -#include "resolu.h" /* maximum rtrace buffer size */ #define MAXPIX (4096/(6*sizeof(float))) @@ -265,8 +261,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, (char *)pb, (char *)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); @@ -274,6 +270,7 @@ int np; } +int getexpos(s) /* get exposure from header line */ char *s; { @@ -285,6 +282,7 @@ char *s; formatval(fmt, s); wrongformat = strcmp(fmt, COLRFMT); } + return(0); } @@ -292,7 +290,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;