Revision: 42069
http://brlcad.svn.sourceforge.net/brlcad/?rev=42069&view=rev
Author: brlcad
Date: 2011-01-11 08:18:51 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
size_t quellage
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/extrude/extrude.c
brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
Modified: brlcad/trunk/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/extrude/extrude.c 2011-01-11 07:52:43 UTC
(rev 42068)
+++ brlcad/trunk/src/librt/primitives/extrude/extrude.c 2011-01-11 08:18:51 UTC
(rev 42069)
@@ -1816,7 +1816,7 @@
bu_log("rt_extrude_tess: A loop is not closed in sketch %s\n",
extrude_ip->sketch_name);
bu_log("\ttessellation failed!!\n");
- for (j=0; j<BU_PTBL_END(&loops); j++) {
+ for (j=0; j<(size_t)BU_PTBL_END(&loops); j++) {
aloop = (struct bu_ptbl *)BU_PTBL_GET(&loops, j);
bu_ptbl_free(aloop);
bu_free((char *)aloop, "aloop");
@@ -1833,16 +1833,16 @@
/* sort the loops to find inside/outside relationships */
containing_loops = (struct bu_ptbl **)bu_calloc(BU_PTBL_END(&loops),
sizeof(struct bu_ptbl *),
"containing_loops");
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
containing_loops[i] = (struct bu_ptbl *)bu_calloc(1, sizeof(struct
bu_ptbl), "containing_loops[i]");
bu_ptbl_init(containing_loops[i], BU_PTBL_END(&loops),
"containing_loops[i]");
}
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
struct bu_ptbl *loopa;
loopa = (struct bu_ptbl *)BU_PTBL_GET(&loops, i);
- for (j=i+1; j<BU_PTBL_END(&loops); j++) {
+ for (j=i+1; j<(size_t)BU_PTBL_END(&loops); j++) {
struct bu_ptbl *loopb;
loopb = (struct bu_ptbl *)BU_PTBL_GET(&loops, j);
@@ -1866,7 +1866,7 @@
/* find an outermost loop */
outer_loop = (struct bu_ptbl *)NULL;
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
if (BU_PTBL_END(containing_loops[i]) == 0) {
outer_loop = (struct bu_ptbl *)BU_PTBL_GET(&loops, i);
break;
@@ -1876,7 +1876,7 @@
if (!outer_loop) {
bu_log("No outer loop in sketch %s\n", extrude_ip->sketch_name);
bu_log("\ttessellation failed\n");
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
aloop = (struct bu_ptbl *)BU_PTBL_GET(&loops, i);
bu_ptbl_free(aloop);
bu_free((char *)aloop, "aloop");
@@ -1891,7 +1891,7 @@
if (BU_LIST_UNINITIALIZED(&rt_g.rtg_vlfree)) {
BU_LIST_INIT(&rt_g.rtg_vlfree);
}
- for (i=0; i<BU_PTBL_END(outer_loop); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(outer_loop); i++) {
genptr_t seg;
seg = (genptr_t)BU_PTBL_GET(outer_loop, i);
@@ -1942,7 +1942,7 @@
}
/* add the rest of the loops */
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
int fdir;
vect_t cross;
fastf_t pt_count=0.0;
@@ -1959,7 +1959,7 @@
fdir = OT_SAME;
}
- for (j=0; j<BU_PTBL_END(aloop); j++) {
+ for (j=0; j<(size_t)BU_PTBL_END(aloop); j++) {
genptr_t seg;
seg = (genptr_t)BU_PTBL_GET(aloop, j);
@@ -2029,7 +2029,7 @@
return 0;
failed:
- for (i=0; i<BU_PTBL_END(&loops); i++) {
+ for (i=0; i<(size_t)BU_PTBL_END(&loops); i++) {
bu_ptbl_free(containing_loops[i]);
bu_free((char *)containing_loops[i], "containing_loops[i]");
}
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2011-01-11 07:52:43 UTC
(rev 42068)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c 2011-01-11 08:18:51 UTC
(rev 42069)
@@ -11133,7 +11133,7 @@
bot->num_faces = 0;
/* count the number of triangles */
- for (i=0; i<BU_PTBL_LEN(&nmg_faces); i++) {
+ for (i=0; i<(size_t)BU_PTBL_LEN(&nmg_faces); i++) {
struct face *f;
struct faceuse *fu;
struct loopuse *lu;
@@ -11168,7 +11168,7 @@
bot->face_mode = (struct bu_bitv *)NULL;
/* fill in the vertices */
- for (i=0; i<BU_PTBL_LEN(&nmg_vertices); i++) {
+ for (i=0; i<(size_t)BU_PTBL_LEN(&nmg_vertices); i++) {
struct vertex_g *vg;
v = (struct vertex *)BU_PTBL_GET(&nmg_vertices, i);
@@ -11182,7 +11182,7 @@
/* fill in the faces */
face_no = 0;
- for (i=0; i<BU_PTBL_LEN(&nmg_faces); i++) {
+ for (i=0; i<(size_t)BU_PTBL_LEN(&nmg_faces); i++) {
struct face *f;
struct faceuse *fu;
struct loopuse *lu;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
