Revision: 68930
http://sourceforge.net/p/brlcad/code/68930
Author: vasco_costa
Date: 2016-09-28 22:19:09 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------
Fix compilation error due to uninitialized variable.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/bot/bot.c
Modified: brlcad/trunk/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/bot.c 2016-09-28 22:12:48 UTC (rev
68929)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2016-09-28 22:19:09 UTC (rev
68930)
@@ -153,6 +153,8 @@
for (idx=0; idx<bip->num_faces; idx++) {
size_t i0, i1, i2;
+ i0 = i1 = i2 = bip->num_vertices;
+
switch (bip->orientation) {
case RT_BOT_CW:
i0 = bip->faces[idx*3];
@@ -176,11 +178,12 @@
bu_free(bot->clt_triangles, "bot triangles");
bot->clt_triangles = NULL;
return -1;
- }
- VMOVE(bot->clt_triangles[idx].v0, &bip->vertices[i0*3]);
- VMOVE(bot->clt_triangles[idx].v1, &bip->vertices[i1*3]);
- VMOVE(bot->clt_triangles[idx].v2, &bip->vertices[i2*3]);
- bot->clt_triangles[idx].surfno = idx;
+ } else {
+ VMOVE(bot->clt_triangles[idx].v0, &bip->vertices[i0*3]);
+ VMOVE(bot->clt_triangles[idx].v1, &bip->vertices[i1*3]);
+ VMOVE(bot->clt_triangles[idx].v2, &bip->vertices[i2*3]);
+ bot->clt_triangles[idx].surfno = idx;
+ }
}
} else {
bot->clt_triangles = NULL;
@@ -195,6 +198,8 @@
for (idx=0; idx<bip->num_face_normals; idx++) {
size_t i0, i1, i2;
+ i0 = i1 = i2 = bip->num_normals;
+
switch (bip->orientation) {
case RT_BOT_CW:
i0 = bip->face_normals[idx*3];
@@ -218,10 +223,11 @@
bu_free(bot->clt_normals, "bot normals");
bot->clt_normals = NULL;
return -1;
- }
- VMOVE(&bot->clt_normals[idx*9+0], &bip->normals[i0*3]);
- VMOVE(&bot->clt_normals[idx*9+3], &bip->normals[i1*3]);
- VMOVE(&bot->clt_normals[idx*9+6], &bip->normals[i2*3]);
+ } else {
+ VMOVE(&bot->clt_normals[idx*9+0], &bip->normals[i0*3]);
+ VMOVE(&bot->clt_normals[idx*9+3], &bip->normals[i1*3]);
+ VMOVE(&bot->clt_normals[idx*9+6], &bip->normals[i2*3]);
+ }
}
} else {
bot->clt_normals = NULL;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
