--- ray/src/rt/initotypes.c	1995/12/08 18:22:37	2.4
+++ 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,8 +31,8 @@ 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  text();
+extern int  mx_func(), mx_data(), mx_pdata();
+extern int  do_text();
 
 FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 
@@ -89,13 +88,16 @@ initotypes()			/* initialize ofun array */
 	ofun[PAT_BDATA].funp = p_bdata;
 	ofun[PAT_CTEXT].funp =
 	ofun[PAT_BTEXT].funp =
-	ofun[MIX_TEXT].funp = text;
+	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);
 }