--- ray/src/rt/fprism.c 1995/02/14 08:54:17 2.3 +++ ray/src/rt/fprism.c 2003/08/04 22:37:53 2.6 @@ -1,9 +1,6 @@ -/* Copyright (c) 1993 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: fprism.c,v 2.6 2003/08/04 22:37:53 greg Exp $"; #endif - /* Ce programme calcule les directions et les energies des rayons lumineux resultant du passage d'un rayon au travers d'un vitrage prismatique @@ -403,7 +400,7 @@ if(r.e > seuil) if (egalite == 0) { if (nbrayons == 0) ray = (TRAYON *)calloc(1,sizeof(TRAYON)); - else ray = (TRAYON *)realloc(ray, (nbrayons+1)*(sizeof(TRAYON))); + else ray = (TRAYON *)realloc((void *)ray, (nbrayons+1)*(sizeof(TRAYON))); if (ray == NULL) error(SYSTEM, "out of memory in sortie\n"); raytemp = &ray[nbrayons]; @@ -731,7 +728,7 @@ if ( X(r_initial) != 0.) static double -l_get_val() +l_get_val(char *nm) { int val, dir, i, trouve, curseur;