Revision: 37524
http://brlcad.svn.sourceforge.net/brlcad/?rev=37524&view=rev
Author: bob1961
Date: 2010-02-02 17:47:15 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--------------
brlcad/trunk/src/librt/binary_obj.c
brlcad/trunk/src/librt/db5_comb.c
brlcad/trunk/src/librt/db5_io.c
brlcad/trunk/src/librt/db_io.c
brlcad/trunk/src/librt/db_path.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/fortray.c
brlcad/trunk/src/librt/opennurbs_ext.cpp
brlcad/trunk/src/librt/pr.c
brlcad/trunk/src/librt/prep.c
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
brlcad/trunk/src/librt/primitives/dsp/dsp.c
brlcad/trunk/src/librt/primitives/ebm/ebm.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
brlcad/trunk/src/librt/primitives/epa/epa.c
brlcad/trunk/src/librt/primitives/eto/eto.c
brlcad/trunk/src/librt/primitives/extrude/extrude.c
brlcad/trunk/src/librt/primitives/generic.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hf/hf.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/revolve/revolve.h
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/vol/vol.c
brlcad/trunk/src/librt/tree.c
brlcad/trunk/src/librt/vlist.c
Modified: brlcad/trunk/src/librt/binary_obj.c
===================================================================
--- brlcad/trunk/src/librt/binary_obj.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/binary_obj.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -106,7 +106,7 @@
}
/* just copy the bytes */
- bip->count = num_items;
+ bip->count = (long)num_items;
bip->u.int8 = (char *)bu_malloc( obj_length, "binary uniform object" );
memcpy(bip->u.int8, bu_fd->buf, obj_length);
Modified: brlcad/trunk/src/librt/db5_comb.c
===================================================================
--- brlcad/trunk/src/librt/db5_comb.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db5_comb.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -92,7 +92,7 @@
tcsp->n_leaf++;
if ( tp->tr_l.tl_mat && !bn_mat_is_identity(tp->tr_l.tl_mat) )
tcsp->n_mat++;
/* Over-estimate storage requirement for matrix # */
- tcsp->leafbytes += strlen(tp->tr_l.tl_name) + 1 + 8;
+ tcsp->leafbytes += (long)strlen(tp->tr_l.tl_name) + 1 + 8;
return 1;
case OP_NOT:
@@ -160,7 +160,7 @@
const union tree *tp,
struct rt_comb_v5_serialize_state *ssp)
{
- int n;
+ size_t n;
int mi;
RT_CK_TREE(tp);
Modified: brlcad/trunk/src/librt/db5_io.c
===================================================================
--- brlcad/trunk/src/librt/db5_io.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db5_io.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -347,11 +347,11 @@
db5_get_raw_internal_fp(struct db5_raw_internal *rip, FILE *fp)
{
struct db5_ondisk_header header;
- unsigned char lenbuf[8];
+ unsigned char lenbuf[8];
int count = 0;
int used;
- long want, got;
- unsigned char *cp;
+ size_t want, got;
+ unsigned char *cp;
if ( fread( (unsigned char *)&header, sizeof header, 1, fp ) != 1 ) {
if ( feof(fp) ) return -1;
@@ -476,7 +476,7 @@
need = sizeof(struct db5_ondisk_header);
need += 8; /* for object_length */
if ( name ) {
- namelen = strlen(name) + 1; /* includes null */
+ namelen = (long)strlen(name) + 1; /* includes null */
if ( namelen > 1 ) {
n_width = db5_select_length_encoding(namelen);
need += namelen + db5_enc_len[n_width];
@@ -811,12 +811,12 @@
avpp = avs->avp;
for ( i = 0; i < (size_t)avs->count; i++, avpp++ ) {
if (avpp->name) {
- need += strlen(avpp->name) + 1; /* include room for NULL */
+ need += (int)strlen(avpp->name) + 1; /* include room for NULL */
} else {
need += 1;
}
if (avpp->value) {
- need += strlen(avpp->value) + 1; /* include room for NULL */
+ need += (int)strlen(avpp->value) + 1; /* include room for NULL */
} else {
need += 1;
}
@@ -839,14 +839,14 @@
int len;
if (avpp->name) {
- len = strlen(avpp->name);
+ len = (int)strlen(avpp->name);
memcpy(cp, avpp->name, len);
cp += len + 1;
}
*cp = '\0'; /* pad null */
if (avpp->value) {
- len = strlen(avpp->value);
+ len = (int)strlen(avpp->value);
memcpy(cp, avpp->value, strlen(avpp->value));
cp += len + 1;
}
Modified: brlcad/trunk/src/librt/db_io.c
===================================================================
--- brlcad/trunk/src/librt/db_io.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db_io.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -54,7 +54,7 @@
/* byte count */
/* byte offset from start of file */
{
- int got;
+ long int got;
RT_CK_DBI(dbip);
if (RT_G_DEBUG&DEBUG_DB) {
@@ -79,7 +79,7 @@
if (fseek(dbip->dbi_fp, offset, 0))
bu_bomb("db_read: fseek error\n");
- got = fread(addr, 1, count, dbip->dbi_fp);
+ got = (long int)fread(addr, 1, count, dbip->dbi_fp);
bu_semaphore_release(BU_SEM_SYSCALL);
@@ -208,7 +208,7 @@
int
db_write(struct db_i *dbip, const genptr_t addr, long int count, long int
offset)
{
- register int got;
+ register long int got;
RT_CK_DBI(dbip);
if (RT_G_DEBUG&DEBUG_DB) {
@@ -231,7 +231,7 @@
bu_suspend_interrupts();
(void)fseek(dbip->dbi_fp, offset, 0);
- got = fwrite(addr, 1, count, dbip->dbi_fp);
+ got = (long int)fwrite(addr, 1, count, dbip->dbi_fp);
fflush(dbip->dbi_fp);
bu_restore_interrupts();
Modified: brlcad/trunk/src/librt/db_path.c
===================================================================
--- brlcad/trunk/src/librt/db_path.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db_path.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -191,7 +191,7 @@
len = 3; /* leading slash, trailing null, spare */
for ( i=pp->fp_len-1; i >= 0; i-- ) {
if ( pp->fp_names[i] )
- len += strlen( pp->fp_names[i]->d_namep ) + 1;
+ len += (int)strlen( pp->fp_names[i]->d_namep ) + 1;
else
len += 16;
}
@@ -205,7 +205,7 @@
rem--;
if ( pp->fp_names[i] ) {
bu_strlcpy( cp, pp->fp_names[i]->d_namep, rem );
- rem -= strlen(pp->fp_names[i]->d_namep);
+ rem -= (int)strlen(pp->fp_names[i]->d_namep);
} else {
bu_strlcpy( cp, "**NULL**", rem );
rem -= 8;
@@ -275,7 +275,7 @@
char *copy;
int nslash = 0;
int ret = 0;
- int len;
+ size_t len;
RT_CK_DBI(dbip);
Modified: brlcad/trunk/src/librt/db_tree.c
===================================================================
--- brlcad/trunk/src/librt/db_tree.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/db_tree.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -49,7 +49,7 @@
void
db_dup_db_tree_state(struct db_tree_state *otsp, const struct db_tree_state
*itsp)
{
- int shader_len=0;
+ size_t shader_len=0;
size_t i;
RT_CK_DBTS(itsp);
Modified: brlcad/trunk/src/librt/fortray.c
===================================================================
--- brlcad/trunk/src/librt/fortray.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/fortray.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -108,7 +108,7 @@
bu_strlcpy( buf, str, len );
/* Remove any trailing blanks */
- for ( i=strlen(buf)-1; i >= 0; i-- ) {
+ for ( i=(int)strlen(buf)-1; i >= 0; i-- ) {
if ( buf[i] != ' ' && buf[i] != '\n' ) break;
buf[i] = '\0';
}
@@ -352,7 +352,7 @@
}
for ( BU_LIST_FOR( rp, region, &((*rtip)->HeadRegion) ) ) {
if ( rp->reg_bit != rnum ) continue;
- len = strlen( rp->reg_name );
+ len = (int)strlen( rp->reg_name );
offset = 0;
if ( len >= fbuflen ) {
offset = len-(fbuflen+1);
Modified: brlcad/trunk/src/librt/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/librt/opennurbs_ext.cpp 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/opennurbs_ext.cpp 2010-02-02 17:47:15 UTC (rev
37524)
@@ -1384,7 +1384,7 @@
// truly - i don't know WTF openNURBS is doing here
// when it prints out the knots, they only have multiplicity 3,
// but yet the order of the curve is 4!!!
- int num_knots = spline.knots.size() - 2;
+ int num_knots = (int)spline.knots.size() - 2;
for (int i = 0; i < num_knots; i++) {
double knot = spline.knots[i+1];
TRACE("knot: " << knot);
Modified: brlcad/trunk/src/librt/pr.c
===================================================================
--- brlcad/trunk/src/librt/pr.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/pr.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -492,7 +492,7 @@
char *left, *right;
char *return_str;
char op = OP_GUARD;
- int return_length;
+ size_t return_length;
if ( tree == NULL )
return bu_strdup("NULL_ptr");
Modified: brlcad/trunk/src/librt/prep.c
===================================================================
--- brlcad/trunk/src/librt/prep.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/prep.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -883,7 +883,7 @@
}
if (BU_LIST_IS_EMPTY(&resp->re_solid_bitv)) {
- solidbits = bu_bitv_new(nbits);
+ solidbits = bu_bitv_new((unsigned int)nbits);
} else {
for (BU_LIST_FOR(solidbits, bu_bitv, &resp->re_solid_bitv)) {
if (solidbits->nbits >= nbits) {
@@ -894,7 +894,7 @@
counter++;
}
if (solidbits == (struct bu_bitv *)&resp->re_solid_bitv) {
- solidbits = bu_bitv_new(nbits);
+ solidbits = bu_bitv_new((unsigned int)nbits);
}
}
@@ -1426,7 +1426,7 @@
int
obj_in_path(const char *path, const char *obj)
{
- int obj_len=strlen(obj);
+ size_t obj_len=strlen(obj);
char *ptr;
ptr = strstr(path, obj);
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -128,14 +128,14 @@
const struct bu_structparse rt_arb_parse[] = {
- { "%f", 3, "V1", bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V2", bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V3", bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V4", bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V5", bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V6", bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V7", bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "V8", bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V1", (long)bu_offsetof(struct rt_arb_internal, pt[0][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V2", (long)bu_offsetof(struct rt_arb_internal, pt[1][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V3", (long)bu_offsetof(struct rt_arb_internal, pt[2][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V4", (long)bu_offsetof(struct rt_arb_internal, pt[3][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V5", (long)bu_offsetof(struct rt_arb_internal, pt[4][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V6", (long)bu_offsetof(struct rt_arb_internal, pt[5][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V7", (long)bu_offsetof(struct rt_arb_internal, pt[6][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V8", (long)bu_offsetof(struct rt_arb_internal, pt[7][X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -2121,7 +2121,7 @@
}
}
- return (hit) ? hits.size() : 0; // MISS
+ return (hit) ? (int)hits.size() : 0; // MISS
}
@@ -2641,8 +2641,8 @@
RT_MemoryArchive::CreateCopy() const
{
genptr_t memory = (genptr_t)bu_malloc(m_buffer.size()*sizeof(char),
"rt_memoryarchive createcopy");
- const int size = m_buffer.size();
- for (int i = 0; i < size; i++) {
+ const size_t size = m_buffer.size();
+ for (size_t i = 0; i < size; i++) {
((char*)memory)[i] = m_buffer[i];
}
return memory;
@@ -2652,7 +2652,7 @@
size_t
RT_MemoryArchive::Read(size_t amount, void* buf)
{
- const int read_amount = (pos + amount > m_buffer.size()) ?
m_buffer.size()-pos : amount;
+ const size_t read_amount = (pos + amount > m_buffer.size()) ?
m_buffer.size()-pos : amount;
const size_t start = pos;
for (; pos < (start+read_amount); pos++) {
((char*)buf)[pos-start] = m_buffer[pos];
@@ -2665,7 +2665,7 @@
RT_MemoryArchive::Write(const size_t amount, const void* buf)
{
// the write can come in at any position!
- const int start = pos;
+ const size_t start = pos;
// resize if needed to support new data
if (m_buffer.size() < (start+amount)) {
m_buffer.resize(start+amount);
@@ -2726,7 +2726,7 @@
ON_TextLog err(stderr);
bool ok = model.Write(archive, 4, "export5", &err);
if (ok) {
- ep->ext_nbytes = archive.Size();
+ ep->ext_nbytes = (long)archive.Size();
ep->ext_buf = archive.CreateCopy();
return 0;
} else {
Modified: brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2010-02-02
17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2010-02-02
17:47:15 UTC (rev 37524)
@@ -155,6 +155,8 @@
list<BBNode*> leaves;
surf->getLeaves(leaves);
+ VSETALL(min, 0.0);
+
ON_TextLog tl(stderr);
vhead = rt_vlblock_find(vbp, RED);
RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
@@ -192,6 +194,8 @@
list<BRNode*> leaves;
st->ctree->getLeaves(leaves);
+ VSETALL(min, 0.0);
+
ON_TextLog tl(stderr);
vhead = rt_vlblock_find(vbp, RED);
RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
Modified: brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2010-02-02
17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/primitives/bspline/bspline.cpp 2010-02-02
17:47:15 UTC (rev 37524)
@@ -944,9 +944,9 @@
grans = rt_nurb_grans(srf);
rec[rec_ptr].d.d_id = ID_BSURF;
- rec[rec_ptr].d.d_nknots = (((srf->u.k_size + srf->v.k_size)
+ rec[rec_ptr].d.d_nknots = (short)(((srf->u.k_size + srf->v.k_size)
* sizeof(dbfloat_t)) + sizeof(union
record)-1)/ sizeof(union record);
- rec[rec_ptr].d.d_nctls = ((
+ rec[rec_ptr].d.d_nctls = (short)((
RT_NURB_EXTRACT_COORDS(srf->pt_type)
* (srf->s_size[0] * srf->s_size[1])
* sizeof(dbfloat_t)) + sizeof(union
record)-1)
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -271,7 +271,7 @@
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "stom", DSP_AO(dsp_stom), hook_mtos_from_stom, NULL, NULL },
+ {"%f", 16, "stom", (long)DSP_AO(dsp_stom), hook_mtos_from_stom, NULL,
NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -282,7 +282,7 @@
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%d", 1, "w", DSP_O(dsp_xcnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", DSP_O(dsp_ycnt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "stom", DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
+ {"%f", 16, "stom", (long)DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -4638,7 +4638,7 @@
{"%d", 1, "n", DSP_O(dsp_ycnt), hook_verify, NULL, NULL },
{"%i", 1, "sm", DSP_O(dsp_smooth), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%c", 1, "cut", DSP_O(dsp_cuttype), hook_verify, NULL, NULL },
- {"%f", 16, "stom", DSP_AO(dsp_stom), hook_verify, NULL, NULL },
+ {"%f", 16, "stom", (long)DSP_AO(dsp_stom), hook_verify, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/ebm/ebm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ebm/ebm.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/ebm/ebm.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -63,11 +63,11 @@
#define RT_EBM_O(m) bu_offsetof(struct rt_ebm_internal, m)
const struct bu_structparse rt_ebm_parse[] = {
- {"%s", RT_EBM_NAME_LEN, "file", bu_offsetofarray(struct
rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%s", RT_EBM_NAME_LEN, "file", (long)bu_offsetofarray(struct
rt_ebm_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "w", RT_EBM_O(xdim),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", RT_EBM_O(ydim),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "d", RT_EBM_O(tallness),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "mat", bu_offsetofarray(struct rt_ebm_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 16, "mat", (long)bu_offsetofarray(struct rt_ebm_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -174,9 +174,9 @@
const struct bu_structparse rt_ehy_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_ehy_internal, ehy_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_ehy_internal, ehy_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_ehy_internal, ehy_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_ehy_internal, ehy_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_ehy_internal, ehy_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_ehy_internal, ehy_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_1", bu_offsetof(struct rt_ehy_internal, ehy_r1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_2", bu_offsetof(struct rt_ehy_internal, ehy_r2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "c", bu_offsetof(struct rt_ehy_internal, ehy_c),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -45,10 +45,10 @@
struct rt_i *rtip));
const struct bu_structparse rt_ell_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_ell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_ell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", bu_offsetof(struct rt_ell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", bu_offsetof(struct rt_ell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_ell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_ell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", (long)bu_offsetof(struct rt_ell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", (long)bu_offsetof(struct rt_ell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/epa/epa.c
===================================================================
--- brlcad/trunk/src/librt/primitives/epa/epa.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/epa/epa.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -173,9 +173,9 @@
const struct bu_structparse rt_epa_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_epa_internal, epa_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_epa_internal, epa_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_epa_internal, epa_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_epa_internal, epa_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_epa_internal, epa_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_epa_internal, epa_Au[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_1", bu_offsetof(struct rt_epa_internal, epa_r1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_2", bu_offsetof(struct rt_epa_internal, epa_r2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/eto/eto.c
===================================================================
--- brlcad/trunk/src/librt/primitives/eto/eto.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/eto/eto.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -139,9 +139,9 @@
const struct bu_structparse rt_eto_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_eto_internal, eto_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "N", bu_offsetof(struct rt_eto_internal, eto_N[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", bu_offsetof(struct rt_eto_internal, eto_C[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_eto_internal, eto_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", (long)bu_offsetof(struct rt_eto_internal, eto_N[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", (long)bu_offsetof(struct rt_eto_internal, eto_C[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_eto_internal, eto_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_d", bu_offsetof(struct rt_eto_internal, eto_rd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/extrude/extrude.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/extrude/extrude.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -2179,7 +2179,7 @@
RT_EXTRUDE_CK_MAGIC(extrude_ip);
BU_CK_EXTERNAL(ep);
- ep->ext_nbytes = 4 * ELEMENTS_PER_VECT * SIZEOF_NETWORK_DOUBLE +
SIZEOF_NETWORK_LONG + strlen(extrude_ip->sketch_name) + 1;
+ ep->ext_nbytes = (long)(4 * ELEMENTS_PER_VECT * SIZEOF_NETWORK_DOUBLE +
SIZEOF_NETWORK_LONG + strlen(extrude_ip->sketch_name) + 1);
ep->ext_buf = (genptr_t)bu_calloc(1, ep->ext_nbytes, "extrusion external");
ptr = (unsigned char *)ep->ext_buf;
Modified: brlcad/trunk/src/librt/primitives/generic.c
===================================================================
--- brlcad/trunk/src/librt/primitives/generic.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/generic.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -211,7 +211,7 @@
BU_ASSERT(&rt_functab[intern->idb_type] == ftp);
intern->idb_meth = ftp;
- intern->idb_ptr = bu_calloc(ftp->ft_internal_size, 1, "rt_generic_make");
+ intern->idb_ptr = bu_calloc((unsigned int)ftp->ft_internal_size, 1,
"rt_generic_make");
*((long *)(intern->idb_ptr)) = ftp->ft_internal_magic;
}
Modified: brlcad/trunk/src/librt/primitives/grip/grip.c
===================================================================
--- brlcad/trunk/src/librt/primitives/grip/grip.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/grip/grip.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -56,8 +56,8 @@
#define GRIP_NULL ((struct grip_specific *)0)
const struct bu_structparse rt_grp_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_grip_internal, center[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "N", bu_offsetof(struct rt_grip_internal, normal[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_grip_internal, center[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", (long)bu_offsetof(struct rt_grip_internal, normal[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "L", bu_offsetof(struct rt_grip_internal, mag),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/half/half.c
===================================================================
--- brlcad/trunk/src/librt/primitives/half/half.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/half/half.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -59,8 +59,8 @@
#define HALF_NULL ((struct half_specific *)0)
const struct bu_structparse rt_hlf_parse[] = {
- { "%f", 3, "N", bu_offsetof(struct rt_half_internal, eqn[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 1, "d", bu_offsetof(struct rt_half_internal, eqn[W]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "N", (long)bu_offsetof(struct rt_half_internal, eqn[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 1, "d", (long)bu_offsetof(struct rt_half_internal, eqn[W]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/hf/hf.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hf/hf.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/hf/hf.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -64,16 +64,16 @@
/* All fields valid in string solid */
const struct bu_structparse rt_hf_parse[] = {
- {"%s", 128, "cfile", bu_offsetofarray(struct rt_hf_internal,
cfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal,
dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal,
fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "cfile", (long)bu_offsetofarray(struct
rt_hf_internal, cfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "dfile", (long)bu_offsetofarray(struct
rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 8, "fmt", (long)bu_offsetofarray(struct
rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "w", HF_O(w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", HF_O(n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shorts", HF_O(shorts),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "file2mm", HF_O(file2mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "v", HF_O(v[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "x", HF_O(x[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "y", HF_O(y[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "v", (long)HF_O(v[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "x", (long)HF_O(x[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "y", (long)HF_O(y[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "xlen", HF_O(xlen),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "ylen", HF_O(ylen),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "zscale", HF_O(zscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
@@ -81,8 +81,8 @@
};
/* Subset of fields found in cfile */
const struct bu_structparse rt_hf_cparse[] = {
- {"%s", 128, "dfile", bu_offsetofarray(struct rt_hf_internal,
dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%s", 8, "fmt", bu_offsetofarray(struct rt_hf_internal,
fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 128, "dfile", (long)bu_offsetofarray(struct
rt_hf_internal, dfile), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%s", 8, "fmt", (long)bu_offsetofarray(struct
rt_hf_internal, fmt), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "w", HF_O(w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", HF_O(n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shorts", HF_O(shorts),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -103,9 +103,9 @@
const struct bu_structparse rt_hyp_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_hyp_internal, hyp_A[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_hyp_internal, hyp_Vi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_hyp_internal, hyp_Hi[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_hyp_internal, hyp_A[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "b", bu_offsetof(struct rt_hyp_internal, hyp_b),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "bnr", bu_offsetof(struct rt_hyp_internal, hyp_bnr),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_bool.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -1139,7 +1139,7 @@
int op;
const char *op_str;
char *name;
- int rem;
+ size_t rem;
RT_CK_TREE(tp);
BN_CK_TOL(tol);
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_ck.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -683,7 +683,7 @@
{
char *errstr;
struct edgeuse *eparent;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_e error str");
snprintf(errstr, len, "%sedge %8lx\n", str, (unsigned long)e);
@@ -717,7 +717,7 @@
nmg_ck_vu(const unsigned long *parent, const struct vertexuse *vu, const char
*str)
{
char *errstr;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_vu error str");
snprintf(errstr, len, "%svertexuse %8lx\n", str, (unsigned long)vu);
@@ -739,7 +739,7 @@
{
char *errstr;
struct edgeuse *eur, *eu_next, *eu_last;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_eu error str");
snprintf(errstr, len, "%sedgeuse %8lx\n", str, (unsigned long)eu);
@@ -819,7 +819,7 @@
nmg_ck_lg(const struct loop *l, const struct loop_g *lg, const char *str)
{
char *errstr;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_lg error str");
snprintf(errstr, len, "%sloop_g %8lx\n", str, (unsigned long)lg);
@@ -838,7 +838,7 @@
nmg_ck_l(const struct loopuse *lu, const struct loop *l, const char *str)
{
char *errstr;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_l error str");
snprintf(errstr, len, "%sloop %8lx\n", str, (unsigned long)l);
@@ -869,7 +869,7 @@
int l;
int edgeuse_num=0;
unsigned long magic1;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_lu error str");
snprintf(errstr, len, "%sloopuse %8lx\n", str, (unsigned long)lu);
@@ -913,7 +913,7 @@
NMG_CK_VERTEXUSE(vu);
nmg_ck_vu(&lu->l.magic, vu, errstr);
} else if (magic1 == NMG_EDGEUSE_MAGIC) {
- l = strlen(errstr);
+ l = (int)strlen(errstr);
for (BU_LIST_FOR(eu, edgeuse, &lu->down_hd)) {
NMG_CK_EDGEUSE(eu);
snprintf(&errstr[l], len-l, "%sedgeuse #%d (%8lx)\n",
@@ -935,7 +935,7 @@
nmg_ck_fg(const struct face *f, const struct face_g_plane *fg, const char *str)
{
char *errstr;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_fg error str");
snprintf(errstr, len, "%sFace_g %8lx\n", str, (unsigned long)f);
@@ -959,7 +959,7 @@
nmg_ck_f(const struct faceuse *fu, const struct face *f, const char *str)
{
char *errstr;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
errstr = bu_calloc(len, 1, "nmg_ck_f error str");
snprintf(errstr, len, "%sFace %8lx\n", str, (unsigned long)f);
@@ -988,7 +988,7 @@
int l;
int loop_number = 0;
struct loopuse *lu;
- int len = strlen(str)+128;
+ int len = (int)strlen(str)+128;
NMG_CK_FACEUSE(fu);
NMG_CK_SHELL(s);
@@ -1024,7 +1024,7 @@
nmg_ck_f(fu, fu->f_p, errstr);
- l = strlen(errstr);
+ l = (int)strlen(errstr);
for (BU_LIST_FOR(lu, loopuse, &fu->lu_hd)) {
NMG_CK_LOOPUSE(lu);
snprintf(&errstr[l], len-l, "%sloopuse #%d (%8lx)\n",
Modified: brlcad/trunk/src/librt/primitives/part/part.c
===================================================================
--- brlcad/trunk/src/librt/primitives/part/part.c 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/part/part.c 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -212,8 +212,8 @@
#define RT_PARTICLE_SURF_HSPHERE 3
const struct bu_structparse rt_part_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_part_internal, part_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_part_internal, part_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_part_internal, part_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_part_internal, part_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_v", bu_offsetof(struct rt_part_internal, part_vrad),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r_h", bu_offsetof(struct rt_part_internal, part_hrad),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/revolve/revolve.h
===================================================================
--- brlcad/trunk/src/librt/primitives/revolve/revolve.h 2010-02-02 17:46:13 UTC
(rev 37523)
+++ brlcad/trunk/src/librt/primitives/revolve/revolve.h 2010-02-02 17:47:15 UTC
(rev 37524)
@@ -25,9 +25,9 @@
const struct bu_structparse rt_revolve_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_revolve_internal, v3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "axis", bu_offsetof(struct rt_revolve_internal, axis3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "R", bu_offsetof(struct rt_revolve_internal, r[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_revolve_internal, v3d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "axis", (long)bu_offsetof(struct rt_revolve_internal,
axis3d[X]), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "R", (long)bu_offsetof(struct rt_revolve_internal, r[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "ang", bu_offsetof(struct rt_revolve_internal, ang),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%V", 1, "sk_name", bu_offsetof(struct rt_revolve_internal,
sketch_name), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/rhc/rhc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rhc/rhc.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/rhc/rhc.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -189,9 +189,9 @@
const struct bu_structparse rt_rhc_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_rhc_internal, rhc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_rhc_internal, rhc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", bu_offsetof(struct rt_rhc_internal, rhc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_rhc_internal, rhc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_rhc_internal, rhc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", (long)bu_offsetof(struct rt_rhc_internal, rhc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_rhc_internal, rhc_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "c", bu_offsetof(struct rt_rhc_internal, rhc_c),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/rpc/rpc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rpc/rpc.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/rpc/rpc.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -185,9 +185,9 @@
const struct bu_structparse rt_rpc_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_rpc_internal, rpc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_rpc_internal, rpc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", bu_offsetof(struct rt_rpc_internal, rpc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_rpc_internal, rpc_V[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_rpc_internal, rpc_H[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", (long)bu_offsetof(struct rt_rpc_internal, rpc_B[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "r", bu_offsetof(struct rt_rpc_internal, rpc_r),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/superell/superell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/superell/superell.c 2010-02-02
17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/primitives/superell/superell.c 2010-02-02
17:47:15 UTC (rev 37524)
@@ -47,10 +47,10 @@
const struct bu_structparse rt_superell_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_superell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_superell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", bu_offsetof(struct rt_superell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", bu_offsetof(struct rt_superell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_superell_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_superell_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", (long)bu_offsetof(struct rt_superell_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", (long)bu_offsetof(struct rt_superell_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "n", bu_offsetof(struct rt_superell_internal, n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ "%f", 1, "e", bu_offsetof(struct rt_superell_internal, e),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -76,12 +76,12 @@
#define ALPHA(x, y, c, d) ((x)*(x)*(c) + (y)*(y)*(d))
const struct bu_structparse rt_tgc_parse[] = {
- { "%f", 3, "V", bu_offsetof(struct rt_tgc_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "H", bu_offsetof(struct rt_tgc_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "A", bu_offsetof(struct rt_tgc_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "B", bu_offsetof(struct rt_tgc_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "C", bu_offsetof(struct rt_tgc_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- { "%f", 3, "D", bu_offsetof(struct rt_tgc_internal, d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "V", (long)bu_offsetof(struct rt_tgc_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "H", (long)bu_offsetof(struct rt_tgc_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "A", (long)bu_offsetof(struct rt_tgc_internal, a[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "B", (long)bu_offsetof(struct rt_tgc_internal, b[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "C", (long)bu_offsetof(struct rt_tgc_internal, c[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ { "%f", 3, "D", (long)bu_offsetof(struct rt_tgc_internal, d[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/tor/tor.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tor/tor.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/tor/tor.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -134,8 +134,8 @@
*/
const struct bu_structparse rt_tor_parse[] = {
- {"%f", 3, "V", bu_offsetof(struct rt_tor_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 3, "H", bu_offsetof(struct rt_tor_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%f", 3, "V", (long)bu_offsetof(struct rt_tor_internal, v[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%f", 3, "H", (long)bu_offsetof(struct rt_tor_internal, h[X]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%f", 1, "r_a", bu_offsetof(struct rt_tor_internal, r_a),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%f", 1, "r_h", bu_offsetof(struct rt_tor_internal, r_h),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{{'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL}
Modified: brlcad/trunk/src/librt/primitives/vol/vol.c
===================================================================
--- brlcad/trunk/src/librt/primitives/vol/vol.c 2010-02-02 17:46:13 UTC (rev
37523)
+++ brlcad/trunk/src/librt/primitives/vol/vol.c 2010-02-02 17:47:15 UTC (rev
37524)
@@ -65,14 +65,14 @@
#define VOL_O(m) bu_offsetof(struct rt_vol_internal, m)
const struct bu_structparse rt_vol_parse[] = {
- {"%s", RT_VOL_NAME_LEN, "file", bu_offsetofarray(struct rt_vol_internal,
file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%s", RT_VOL_NAME_LEN, "file", (long)bu_offsetofarray(struct
rt_vol_internal, file), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "w", VOL_O(xdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", VOL_O(ydim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "d", VOL_O(zdim), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "lo", VOL_O(lo), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "hi", VOL_O(hi), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", ELEMENTS_PER_VECT, "size", bu_offsetofarray(struct rt_vol_internal,
cellsize), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 16, "mat", bu_offsetofarray(struct rt_vol_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", ELEMENTS_PER_VECT, "size", (long)bu_offsetofarray(struct
rt_vol_internal, cellsize), BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 16, "mat", (long)bu_offsetofarray(struct rt_vol_internal, mat),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -414,7 +414,7 @@
register int y;
register int z;
mat_t tmat;
- int ret;
+ size_t ret;
if (dbip) RT_CK_DBI(dbip);
@@ -558,7 +558,7 @@
register int y;
register int z;
mat_t tmat;
- int ret;
+ size_t ret;
if (dbip) RT_CK_DBI(dbip);
Modified: brlcad/trunk/src/librt/tree.c
===================================================================
--- brlcad/trunk/src/librt/tree.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/tree.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -152,7 +152,7 @@
{
struct region *rp;
struct directory *dp;
- int shader_len=0;
+ size_t shader_len=0;
struct rt_i *rtip;
size_t i;
Tcl_HashTable *tbl = (Tcl_HashTable *)client_data;
Modified: brlcad/trunk/src/librt/vlist.c
===================================================================
--- brlcad/trunk/src/librt/vlist.c 2010-02-02 17:46:13 UTC (rev 37523)
+++ brlcad/trunk/src/librt/vlist.c 2010-02-02 17:47:15 UTC (rev 37524)
@@ -376,9 +376,9 @@
rt_vlist_export(struct bu_vls *vls, struct bu_list *hp, const char *name)
{
register struct bn_vlist *vp;
- int nelem;
- int namelen;
- int nbytes;
+ size_t nelem;
+ size_t namelen;
+ size_t nbytes;
unsigned char *buf;
unsigned char *bp;
@@ -396,9 +396,9 @@
namelen = strlen(name)+1;
nbytes = namelen + 4 + nelem * (1+3*8) + 2;
- bu_vls_setlen(vls, nbytes);
+ bu_vls_setlen(vls, (int)nbytes);
buf = (unsigned char *)bu_vls_addr(vls);
- bp = bu_plong(buf, nelem);
+ bp = bu_plong(buf, (int)nelem);
bu_strlcpy((char *)bp, name, namelen);
bp += namelen;
@@ -436,9 +436,9 @@
{
register const unsigned char *bp;
const unsigned char *pp; /* point pointer */
- int nelem;
- int namelen;
- int i;
+ size_t nelem;
+ size_t namelen;
+ size_t i;
point_t point;
BU_CK_VLS(namevls);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
