Revision: 51798
http://brlcad.svn.sourceforge.net/brlcad/?rev=51798&view=rev
Author: r_weiss
Date: 2012-08-07 21:00:39 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Changed function "nmg_edge_fuse" to accept as input a pointer to either an NMG
object or bu_ptbl structure. Changed file "nmg_fuse.c".
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2012-08-07 20:41:24 UTC
(rev 51797)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c 2012-08-07 21:00:39 UTC
(rev 51798)
@@ -1056,7 +1056,8 @@
edgeuse_vert_list_t edgeuse_vert_list;
int count=0;
size_t nelem;
- struct bu_ptbl eu_list;
+ struct bu_ptbl *eu_list;
+ struct bu_ptbl tmp;
struct edge *e1;
struct edgeuse *eu, *eu1;
struct vertex *v1;
@@ -1065,18 +1066,23 @@
register struct edgeuse *eu2;
register struct vertex *v2;
- bu_ptbl_init(&eu_list, 64, "eu1_list1 buffer");
- nmg_edgeuse_tabulate(&eu_list, magic_p);
+ if (*magic_p == BU_PTBL_MAGIC) {
+ eu_list = (struct bu_ptbl *)magic_p;
+ } else {
+ bu_ptbl_init(&tmp, 64, "eu1_list1 buffer");
+ nmg_edgeuse_tabulate(&tmp, magic_p);
+ eu_list = &tmp;
+ }
- nelem = BU_PTBL_END(&eu_list) * 2;
+ nelem = BU_PTBL_END(eu_list) * 2;
if (nelem == 0)
return 0;
edgeuse_vert_list = (edgeuse_vert_list_t)bu_calloc(nelem, 2 *
sizeof(size_t), "edgeuse_vert_list");
j = 0;
- for (i = 0; i < (size_t)BU_PTBL_END(&eu_list) ; i++) {
- eu = (struct edgeuse *)BU_PTBL_GET(&eu_list, i);
+ for (i = 0; i < (size_t)BU_PTBL_END(eu_list) ; i++) {
+ eu = (struct edgeuse *)BU_PTBL_GET(eu_list, i);
edgeuse_vert_list[j][0] = (size_t)eu;
edgeuse_vert_list[j][1] = (size_t)eu->vu_p->v_p;
j++;
@@ -1128,8 +1134,12 @@
}
bu_free((char *)edgeuse_vert_list, "edgeuse_vert_list");
- bu_ptbl_free(&eu_list);
+ /* if bu_ptbl was passed into this function don't free it here */
+ if (*magic_p != BU_PTBL_MAGIC) {
+ bu_ptbl_free(eu_list);
+ }
+
return count;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
