Revision: 45867
http://brlcad.svn.sourceforge.net/brlcad/?rev=45867&view=rev
Author: brlcad
Date: 2011-08-09 23:18:18 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
make the caller allocate an ON_Brep object, maybe they want to avoid dynamic
memory allocation altogether. this plugs a leak in the csgbrep proc-db and
begs changing the *_brep() param to a simple ON_Brep * instead of a double
pointer.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/arb8/arb8_brep.cpp
brlcad/trunk/src/librt/primitives/arbn/arbn_brep.cpp
brlcad/trunk/src/librt/primitives/bot/bot_brep.cpp
brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp
brlcad/trunk/src/librt/primitives/dsp/dsp_brep.cpp
brlcad/trunk/src/librt/primitives/ebm/ebm_brep.cpp
brlcad/trunk/src/librt/primitives/ehy/ehy_brep.cpp
brlcad/trunk/src/librt/primitives/ell/ell_brep.cpp
brlcad/trunk/src/librt/primitives/epa/epa_brep.cpp
brlcad/trunk/src/librt/primitives/eto/eto_brep.cpp
brlcad/trunk/src/librt/primitives/hyp/hyp_brep.cpp
brlcad/trunk/src/librt/primitives/nmg/nmg_brep.cpp
brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp
brlcad/trunk/src/librt/primitives/poly/poly_brep.cpp
brlcad/trunk/src/librt/primitives/revolve/revolve_brep.cpp
brlcad/trunk/src/librt/primitives/rhc/rhc_brep.cpp
brlcad/trunk/src/librt/primitives/rpc/rpc_brep.cpp
brlcad/trunk/src/librt/primitives/sketch/sketch_brep.cpp
brlcad/trunk/src/librt/primitives/tgc/tgc_brep.cpp
brlcad/trunk/src/librt/primitives/vol/vol_brep.cpp
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -50,9 +50,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *arbm = nmg_mm();
struct nmgregion *arbr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
Modified: brlcad/trunk/src/librt/primitives/arbn/arbn_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/arbn/arbn_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/arbn/arbn_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -51,9 +51,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *arbn_nmg = nmg_mm();
struct nmgregion *arbnmgr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
Modified: brlcad/trunk/src/librt/primitives/bot/bot_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/bot_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/bot/bot_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -50,9 +50,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *botm = nmg_mm();
struct nmgregion *botr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -42,7 +42,6 @@
RT_NURB_CK_MAGIC(nip);
ON_TextLog log(stderr);
- *b = ON_Brep::New();
for (i = 0; i < nip->nsrf; i++) {
struct face_g_snurb *surface = nip->srfs[i];
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/dsp/dsp_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -48,8 +48,6 @@
dsp_ip = (struct rt_dsp_internal *)ip->idb_ptr;
RT_DSP_CK_MAGIC(dsp_ip);
- *b = ON_Brep::New();
-
/* A DSP brep is broken down into faces as follows:
*
* 1. The bottom face, a simple planar surface
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/ebm/ebm_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -50,9 +50,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *ebmm = nmg_mm();
struct nmgregion *ebmr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
Modified: brlcad/trunk/src/librt/primitives/ehy/ehy_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_ehy_internal *)ip->idb_ptr;
RT_EHY_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_TextLog dump_to_stdout;
ON_TextLog* dump = &dump_to_stdout;
Modified: brlcad/trunk/src/librt/primitives/ell/ell_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/ell/ell_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -41,8 +41,6 @@
eip = (struct rt_ell_internal *)ip->idb_ptr;
RT_ELL_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
point_t origin;
VSET(origin, 0, 0, 0);
Modified: brlcad/trunk/src/librt/primitives/epa/epa_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/epa/epa_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/epa/epa_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_epa_internal *)ip->idb_ptr;
RT_EPA_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_TextLog dump_to_stdout;
ON_TextLog* dump = &dump_to_stdout;
Modified: brlcad/trunk/src/librt/primitives/eto/eto_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/eto/eto_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/eto/eto_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -38,8 +38,6 @@
{
struct rt_eto_internal *eip;
- *b = NULL;
-
RT_CK_DB_INTERNAL(ip);
eip = (struct rt_eto_internal *)ip->idb_ptr;
RT_ETO_CK_MAGIC(eip);
@@ -96,7 +94,6 @@
eto_surf->m_axis = revaxis;
/* Create brep with one face*/
- *b = ON_Brep::New();
ON_BrepFace *newface = (*b)->NewFace(*eto_surf);
(*b)->FlipFace(*newface);
// (*b)->Standardize();
Modified: brlcad/trunk/src/librt/primitives/hyp/hyp_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_hyp_internal *)ip->idb_ptr;
RT_HYP_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
point_t p1_origin, p2_origin;
ON_3dPoint plane1_origin, plane2_origin;
ON_3dVector plane_x_dir, plane_y_dir;
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -70,8 +70,6 @@
brepi = static_cast<long*>(bu_malloc(m->maxindex * sizeof(long),
"rt_nmg_brep: brepi[]"));
for (int i = 0; i < m->maxindex; i++) brepi[i] = -INT_MAX;
- *b = ON_Brep::New();
-
for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
for (BU_LIST_FOR(s, shell, &r->s_hd)) {
for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
Modified: brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -154,8 +154,6 @@
if (BU_LIST_IS_HEAD(&curp->l, &pip->pipe_segs_head)) return;
VMOVE(current_point, prevp->pp_coord);
-
- *b = ON_Brep::New();
VSUB2(pipe_dir, prevp->pp_coord, curp->pp_coord);
bn_vec_ortho(x_dir, pipe_dir);
Modified: brlcad/trunk/src/librt/primitives/poly/poly_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/poly/poly_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/poly/poly_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -50,9 +50,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *polym = nmg_mm();
struct nmgregion *polyr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
Modified: brlcad/trunk/src/librt/primitives/revolve/revolve_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/revolve/revolve_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/revolve/revolve_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -163,8 +163,6 @@
eip = rip->sk;
RT_SKETCH_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_3dPoint plane_origin;
ON_3dVector plane_x_dir, plane_y_dir;
Modified: brlcad/trunk/src/librt/primitives/rhc/rhc_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/rhc/rhc_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/rhc/rhc_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_rhc_internal *)ip->idb_ptr;
RT_RHC_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_TextLog dump_to_stdout;
ON_TextLog* dump = &dump_to_stdout;
Modified: brlcad/trunk/src/librt/primitives/rpc/rpc_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/rpc/rpc_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/rpc/rpc_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_rpc_internal *)ip->idb_ptr;
RT_RPC_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_TextLog dump_to_stdout;
ON_TextLog* dump = &dump_to_stdout;
Modified: brlcad/trunk/src/librt/primitives/sketch/sketch_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch_brep.cpp 2011-08-09
23:16:41 UTC (rev 45866)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch_brep.cpp 2011-08-09
23:18:18 UTC (rev 45867)
@@ -144,8 +144,6 @@
eip = (struct rt_sketch_internal *)ip->idb_ptr;
RT_SKETCH_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
ON_3dPoint plane_origin;
ON_3dVector plane_x_dir, plane_y_dir;
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -42,8 +42,6 @@
eip = (struct rt_tgc_internal *)ip->idb_ptr;
RT_TGC_CK_MAGIC(eip);
- *b = ON_Brep::New();
-
point_t p1_origin, p2_origin;
ON_3dPoint plane1_origin, plane2_origin;
ON_3dVector plane1_x_dir, plane1_y_dir, plane2_x_dir, plane2_y_dir;
Modified: brlcad/trunk/src/librt/primitives/vol/vol_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/vol/vol_brep.cpp 2011-08-09 23:16:41 UTC
(rev 45866)
+++ brlcad/trunk/src/librt/primitives/vol/vol_brep.cpp 2011-08-09 23:18:18 UTC
(rev 45867)
@@ -50,9 +50,6 @@
ttmptol.norm = 0;
const struct rt_tess_tol *ttol = &ttmptol;
- *b = NULL;
- *b = ON_Brep::New();
-
struct model *volm = nmg_mm();
struct nmgregion *volr;
tmp_internal->idb_ptr = (genptr_t)ip->idb_ptr;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
