--- ray/src/rt/initotypes.c 1996/06/22 09:48:55 2.5 +++ ray/src/rt/initotypes.c 2003/02/25 02:47:22 2.8 @@ -1,13 +1,12 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: initotypes.c,v 2.8 2003/02/25 02:47:22 greg Exp $"; #endif - /* * Initialize ofun[] list for renderers */ +#include "copyright.h" + #include "standard.h" #include "otypes.h" @@ -32,7 +31,7 @@ extern int m_brdf2(); extern int t_func(), t_data(); extern int p_cfunc(), p_bfunc(); extern int p_pdata(), p_cdata(), p_bdata(); -extern int mx_func(), mx_data(); +extern int mx_func(), mx_data(), mx_pdata(); extern int do_text(); FUN ofun[NUMOTYPE] = INIT_OTYPE; @@ -92,10 +91,13 @@ initotypes() /* initialize ofun array */ ofun[MIX_TEXT].funp = do_text; ofun[MIX_FUNC].funp = mx_func; ofun[MIX_DATA].funp = mx_data; + ofun[MIX_PICT].funp = mx_pdata; } o_default() /* default action is error */ { error(INTERNAL, "unexpected object call"); + /* call to pull in freeobjmem.o */ + free_objs(0, 0); }