[brlcad-commits] SF.net SVN: brlcad:[34337] brlcad/trunk/src/librt/primitives/dsp/dsp.c

[<br...@us...>]

Revision: 34337
          http://brlcad.svn.sourceforge.net/brlcad/?rev=34337&view=rev
Author:   brlcad
Date:     2009-04-28 14:35:46 +0000 (Tue, 28 Apr 2009)

Log Message:
-----------
dsp needs the second struct resource pointer too and hide rt_binunif_ifree() by calling through the functab.

Modified Paths:
--------------
    brlcad/trunk/src/librt/primitives/dsp/dsp.c

Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c	2009-04-28 14:32:32 UTC (rev 34336)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c	2009-04-28 14:35:46 UTC (rev 34337)
@@ -114,9 +114,7 @@
 			       const struct db_i	*dbip,
 			       const char *name);
 
-extern void rt_binunif_ifree( struct rt_db_internal	*ip );
 
-
 #define dlog if (RT_G_DEBUG & DEBUG_HF) bu_log
 
 
@@ -4543,7 +4541,7 @@
  *  Free the storage associated with the rt_db_internal version of this solid.
  */
 void
-rt_dsp_ifree(struct rt_db_internal *ip)
+rt_dsp_ifree(struct rt_db_internal *ip, struct resource *resp)
 {
     register struct rt_dsp_internal	*dsp_ip;
 
@@ -4551,6 +4549,11 @@
 	bu_log("rt_dsp_ifree()\n");
 
     RT_CK_DB_INTERNAL(ip);
+
+    if (!resp) {
+	resp = &rt_uniresource;
+    }
+
     dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr;
     RT_DSP_CK_MAGIC(dsp_ip);
 
@@ -4560,7 +4563,7 @@
     }
 
     if (dsp_ip->dsp_bip) {
-	rt_binunif_ifree( (struct rt_db_internal *) dsp_ip->dsp_bip);
+	dsp_ip->dsp_bip->idb_meth->ft_ifree((struct rt_db_internal *) dsp_ip->dsp_bip, resp);
     }
 
     dsp_ip->magic = 0;			/* sanity */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.