--- ray/src/px/pcomb.c 2004/03/28 20:33:14 2.32 +++ ray/src/px/pcomb.c 2004/08/31 18:52:27 2.34 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pcomb.c,v 2.32 2004/03/28 20:33:14 schorsch Exp $"; +static const char RCSid[] = "$Id: pcomb.c,v 2.34 2004/08/31 18:52:27 greg Exp $"; #endif /* * Combine picture files according to calcomp functions. @@ -8,9 +8,8 @@ static const char RCSid[] = "$Id: pcomb.c,v 2.32 2004/ */ #include "platform.h" +#include "standard.h" #include "rtprocess.h" -#include "rterror.h" -#include "rtmisc.h" #include "color.h" #include "calcomp.h" #include "view.h" @@ -335,8 +334,6 @@ double (*ourbright)() = rgb_bright; static void init(void) /* perform final setup */ { - double l_colin(char *), l_expos(char *), l_pixaspect(char *), - l_ray(char *), l_psize(char *); register int i; /* define constants */ varset("PI", ':', PI);