[brlcad-commits] SF.net SVN: brlcad:[37520] brlcad/trunk/misc/win32-msvc8/Makefile.am
Revision: 37520 http://brlcad.svn.sourceforge.net/brlcad/?rev=37520view=rev Author: brlcad Date: 2010-02-02 13:14:50 + (Tue, 02 Feb 2010) Log Message: --- add the missing libanalyze to the dist Modified Paths: -- brlcad/trunk/misc/win32-msvc8/Makefile.am Modified: brlcad/trunk/misc/win32-msvc8/Makefile.am === --- brlcad/trunk/misc/win32-msvc8/Makefile.am 2010-02-02 01:13:50 UTC (rev 37519) +++ brlcad/trunk/misc/win32-msvc8/Makefile.am 2010-02-02 13:14:50 UTC (rev 37520) @@ -88,6 +88,7 @@ kurt/kurt.vcproj \ libItcl/libItcl.vcproj \ libItk/libItk.vcproj \ + libanalyze/libanalyze.vcproj \ libbn/libbn.vcproj \ libbu/libbu.vcproj \ libdm/libdm.vcproj \ 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
[brlcad-commits] SF.net SVN: brlcad:[37521] brlcad/trunk/src/other/tkhtml3/Makefile.am
Revision: 37521 http://brlcad.svn.sourceforge.net/brlcad/?rev=37521view=rev Author: brlcad Date: 2010-02-02 13:17:50 + (Tue, 02 Feb 2010) Log Message: --- add a couple files missing from the dist Modified Paths: -- brlcad/trunk/src/other/tkhtml3/Makefile.am Modified: brlcad/trunk/src/other/tkhtml3/Makefile.am === --- brlcad/trunk/src/other/tkhtml3/Makefile.am 2010-02-02 13:14:50 UTC (rev 37520) +++ brlcad/trunk/src/other/tkhtml3/Makefile.am 2010-02-02 13:17:50 UTC (rev 37521) @@ -495,8 +495,10 @@ done EXTRA_DIST = \ + doc \ src \ - doc + tclconfig\README.txt \ + tclconfig\tcl.m4 .PHONY: all binaries clean depend distclean doc install libraries test 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
[brlcad-commits] SF.net SVN: brlcad:[37522] brlcad/trunk/src/other/tkhtml3/Makefile.am
Revision: 37522 http://brlcad.svn.sourceforge.net/brlcad/?rev=37522view=rev Author: brlcad Date: 2010-02-02 15:35:12 + (Tue, 02 Feb 2010) Log Message: --- heh, backslash happy Modified Paths: -- brlcad/trunk/src/other/tkhtml3/Makefile.am Modified: brlcad/trunk/src/other/tkhtml3/Makefile.am === --- brlcad/trunk/src/other/tkhtml3/Makefile.am 2010-02-02 13:17:50 UTC (rev 37521) +++ brlcad/trunk/src/other/tkhtml3/Makefile.am 2010-02-02 15:35:12 UTC (rev 37522) @@ -497,8 +497,8 @@ EXTRA_DIST = \ doc \ src \ - tclconfig\README.txt \ - tclconfig\tcl.m4 + tclconfig/README.txt \ + tclconfig/tcl.m4 .PHONY: all binaries clean depend distclean doc install libraries test 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
[brlcad-commits] SF.net SVN: brlcad:[37523] brlcad/trunk/include/opennurbs_ext.h
Revision: 37523
http://brlcad.svn.sourceforge.net/brlcad/?rev=37523view=rev
Author: bob1961
Date: 2010-02-02 17:46:13 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/include/opennurbs_ext.h
Modified: brlcad/trunk/include/opennurbs_ext.h
===
--- brlcad/trunk/include/opennurbs_ext.h2010-02-02 15:35:12 UTC (rev
37522)
+++ brlcad/trunk/include/opennurbs_ext.h2010-02-02 17:46:13 UTC (rev
37523)
@@ -424,14 +424,15 @@
corners[4] = BANodeBA::m_estimate;
// find the point on the curve closest to pt
- int mini = 0;
+ size_t mini = 0;
double mindist = pt.DistanceTo(corners[mini]);
double tmpdist;
for (size_t i = 1; i 5; i++) {
tmpdist = pt.DistanceTo(corners[i]);
TRACE(\t mindist tmpdist);
if (tmpdist mindist) {
- mini = i; mindist = tmpdist;
+ mini = i;
+ mindist = tmpdist;
}
}
TRACE(Closest: mindist ; PT2(uvs[mini]));
@@ -896,7 +897,7 @@
corners[4] = BVNodeBV::m_estimate;
// find the point on the surface closest to pt
- int mini = 0;
+ size_t mini = 0;
double mindist = pt.DistanceTo(corners[mini]);
double tmpdist;
for (size_t i = 1; i 5; i++) {
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
[brlcad-commits] SF.net SVN: brlcad:[37524] brlcad/trunk/src/librt
Revision: 37524
http://brlcad.svn.sourceforge.net/brlcad/?rev=37524view=rev
Author: bob1961
Date: 2010-02-02 17:47:15 + (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)
{
-intn;
+size_t n;
intmi;
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];
intcount = 0;
intused;
-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 +=
[brlcad-commits] SF.net SVN: brlcad:[37526] brlcad/trunk/src/librt/primitives
Revision: 37526
http://brlcad.svn.sourceforge.net/brlcad/?rev=37526view=rev
Author: bob1961
Date: 2010-02-02 20:08:38 + (Tue, 02 Feb 2010)
Log Message:
---
The cast to long is now part of the bu_offsetof definition.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/arb8/arb8.c
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/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/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
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 18:14:00 UTC
(rev 37525)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2010-02-02 20:08:38 UTC
(rev 37526)
@@ -128,14 +128,14 @@
const struct bu_structparse rt_arb_parse[] = {
-{ %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 },
+{ %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 },
{ {'\0', '\0', '\0', '\0'}, 0, (char *)NULL, 0, BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL }
};
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 18:14:00 UTC (rev
37525)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2010-02-02 20:08:38 UTC (rev
37526)
@@ -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, (long)DSP_AO(dsp_stom), hook_mtos_from_stom, NULL,
NULL },
+{%f, 16, stom, 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, (long)DSP_AO(dsp_stom), BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL },
+{%f, 16, stom, 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,
[brlcad-commits] SF.net SVN: brlcad:[37527] brlcad/trunk/include/bu.h
Revision: 37527 http://brlcad.svn.sourceforge.net/brlcad/?rev=37527view=rev Author: bob1961 Date: 2010-02-02 20:09:17 + (Tue, 02 Feb 2010) Log Message: --- The cast to long is now part of the bu_offsetof definition. Modified Paths: -- brlcad/trunk/include/bu.h Modified: brlcad/trunk/include/bu.h === --- brlcad/trunk/include/bu.h 2010-02-02 20:08:38 UTC (rev 37526) +++ brlcad/trunk/include/bu.h 2010-02-02 20:09:17 UTC (rev 37527) @@ -1765,12 +1765,15 @@ * Files using bu_offsetof or bu_offsetofarray will need to include * stddef.h in order to get offsetof() */ +/* FIXME - this is a temporary cast. The bu_structparse sp_offset member + * should be a size_t. + */ #ifndef offsetof # define bu_offsetof(_t, _m) (size_t)_t *)0)-_m)) # define bu_offsetofarray(_t, _m) (size_t)_t *)0)-_m)) #else -# define bu_offsetof(_t, _m) offsetof(_t, _m) -# define bu_offsetofarray(_t, _m) offsetof(_t, _m[0]) +# define bu_offsetof(_t, _m) (long)offsetof(_t, _m) +# define bu_offsetofarray(_t, _m) (long)offsetof(_t, _m[0]) #endif 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
[brlcad-commits] SF.net SVN: brlcad:[37528] brlcad/trunk/src/libbu
Revision: 37528
http://brlcad.svn.sourceforge.net/brlcad/?rev=37528view=rev
Author: bob1961
Date: 2010-02-02 21:03:18 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libbu/bitv.c
brlcad/trunk/src/libbu/brlcad_path.c
brlcad/trunk/src/libbu/convert.c
brlcad/trunk/src/libbu/dirname.c
brlcad/trunk/src/libbu/fopen_uniq.c
brlcad/trunk/src/libbu/malloc.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/temp.c
brlcad/trunk/src/libbu/units.c
brlcad/trunk/src/libbu/vls.c
Modified: brlcad/trunk/src/libbu/bitv.c
===
--- brlcad/trunk/src/libbu/bitv.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/bitv.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -201,8 +201,8 @@
void
bu_bitv_to_hex(struct bu_vls *v, const struct bu_bitv *bv)
{
-unsigned int word_count = 0;
-unsigned int chunksize = 0;
+size_t word_count = 0;
+size_t chunksize = 0;
/* necessarily volatile to keep the compiler from complaining
* about unreachable code during optimization.
*/
@@ -212,7 +212,7 @@
BU_CK_BITV(bv);
word_count = bv-nbits / 8 / BVS;
-bu_vls_extend(v, word_count * BVS * 2 + 1);
+bu_vls_extend(v, (unsigned int)(word_count * BVS * 2 + 1));
while (word_count--) {
chunksize = (unsigned int)BVS;
@@ -233,8 +233,8 @@
int bytes;
struct bu_bitv *bv;
unsigned long c;
-int word_count;
-unsigned int chunksize = 0;
+size_t word_count;
+size_t chunksize = 0;
volatile size_t BVS = sizeof(bitv_t);
abyte[2] = '\0';
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===
--- brlcad/trunk/src/libbu/brlcad_path.c2010-02-02 20:09:17 UTC (rev
37527)
+++ brlcad/trunk/src/libbu/brlcad_path.c2010-02-02 21:03:18 UTC (rev
37528)
@@ -285,7 +285,7 @@
HIDDEN int
_bu_find_path(char result[MAXPATHLEN], const char *lhs, const char *rhs,
struct bu_vls *searched, const char *where)
{
-int llen, rlen;
+size_t llen, rlen;
static const char *currdir=.;
/* swap right with left if there is no left so logic is simplified
@@ -425,7 +425,7 @@
lhs = bu_getprogname();
if (lhs) {
char argv0[MAX_WHERE_SIZE] = {0};
- int len = strlen(lhs);
+ size_t len = strlen(lhs);
snprintf(argv0, MAX_WHERE_SIZE, %s, lhs);
/* need to trim off the trailing binary */
Modified: brlcad/trunk/src/libbu/convert.c
===
--- brlcad/trunk/src/libbu/convert.c2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/convert.c2010-02-02 21:03:18 UTC (rev 37528)
@@ -124,7 +124,7 @@
bu_cv_fmt_cookie(char *buf, size_t buflen, int cookie)
{
register char *cp = buf;
-unsigned int len;
+size_t len;
if (buflen == 0) {
fprintf(stderr, bu_cv_pr_cookie: call me with a bigger buffer\n);
@@ -342,7 +342,7 @@
int limit;
register int i;
-limit = size / sizeof(signed short);
+limit = (int)(size / sizeof(signed short));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -364,7 +364,7 @@
int limit;
register int i;
-limit = size / sizeof(unsigned short);
+limit = (int)(size / sizeof(unsigned short));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -382,7 +382,7 @@
int limit;
register int i;
-limit = size / sizeof(signed long int);
+limit = (int)(size / sizeof(signed long int));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -404,7 +404,7 @@
int limit;
register int i;
-limit = size / sizeof(unsigned long int);
+limit = (int)(size / sizeof(unsigned long int));
if (limit count) count = limit;
for (i=0; icount; i++) {
@@ -426,7 +426,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
-limit = size / 2;
+limit = (int)(size / 2);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -445,7 +445,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
-limit = size / 2;
+limit = (int)(size / 2);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -464,7 +464,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
-limit = size / 4;
+limit = (int)(size / 4);
if (count limit) count = limit;
for (i=0; icount; i++) {
@@ -485,7 +485,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
-limit = size / 4;
+limit = (int)(size / 4);
if (count limit) {
count = limit;
}
@@ -557,7 +557,7 @@
*
[brlcad-commits] SF.net SVN: brlcad:[37529] brlcad/trunk/src/libbn/sphmap.c
Revision: 37529
http://brlcad.svn.sourceforge.net/brlcad/?rev=37529view=rev
Author: bob1961
Date: 2010-02-02 21:12:21 + (Tue, 02 Feb 2010)
Log Message:
---
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libbn/sphmap.c
Modified: brlcad/trunk/src/libbn/sphmap.c
===
--- brlcad/trunk/src/libbn/sphmap.c 2010-02-02 21:03:18 UTC (rev 37528)
+++ brlcad/trunk/src/libbn/sphmap.c 2010-02-02 21:12:21 UTC (rev 37529)
@@ -241,7 +241,7 @@
total += mapp-nx[y];
bu_semaphore_acquire( BU_SEM_SYSCALL );/* lock */
-y = fread( (char *)mapp-_data, mapp-elsize, total, fp ); /* res_syscall
*/
+y = (int)fread( (char *)mapp-_data, mapp-elsize, total, fp );/*
res_syscall */
(void) fclose( fp );
bu_semaphore_release( BU_SEM_SYSCALL );/* unlock */
@@ -278,8 +278,8 @@
for ( i = 0; i mapp-ny; i++ ) {
bu_semaphore_acquire( BU_SEM_SYSCALL ); /* lock */
- got = fwrite( (char *)mapp-xbin[i], mapp-elsize, /* res_syscall
*/
- mapp-nx[i], fp );
+ got = (int)fwrite( (char *)mapp-xbin[i], mapp-elsize, /* res_syscall
*/
+ mapp-nx[i], fp );
bu_semaphore_release( BU_SEM_SYSCALL ); /* unlock */
if ( got != mapp-nx[i] ) {
bu_log(spm_save(%s): write error\n, filename);
@@ -332,7 +332,7 @@
/* Shamelessly suck it all in */
buffer = (unsigned char *)bu_malloc( (unsigned)(nx*nx*3), spm_px_load
buffer );
bu_semaphore_acquire( BU_SEM_SYSCALL );/* lock */
-i = fread( (char *)buffer, 3, nx*ny, fp ); /* res_syscall */
+i = (int)fread( (char *)buffer, 3, nx*ny, fp );/* res_syscall */
(void) fclose( fp );
bu_semaphore_release( BU_SEM_SYSCALL );/* unlock */
if ( i != nx*ny ) {
@@ -401,7 +401,7 @@
for ( x = 0; x nx; x++ ) {
spm_read( mapp, pixel, (double)x/(double)nx, (double)y/(double)ny );
bu_semaphore_acquire( BU_SEM_SYSCALL ); /* lock */
- got = fwrite( (char *)pixel, sizeof(pixel), 1, fp );/*
res_syscall */
+ got = (int)fwrite( (char *)pixel, sizeof(pixel), 1, fp ); /*
res_syscall */
bu_semaphore_release( BU_SEM_SYSCALL ); /* unlock */
if ( got != 1 ) {
bu_log(spm_px_save(%s): write error\n, filename);
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
[brlcad-commits] SF.net SVN: brlcad:[37530] brlcad/trunk/src/libdm
Revision: 37530
http://brlcad.svn.sourceforge.net/brlcad/?rev=37530view=rev
Author: bob1961
Date: 2010-02-02 22:17:50 + (Tue, 02 Feb 2010)
Log Message:
---
Quell a few warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libdm/axes.c
brlcad/trunk/src/libdm/dm-Null.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/libdm/dm_obj.c
Modified: brlcad/trunk/src/libdm/axes.c
===
--- brlcad/trunk/src/libdm/axes.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/axes.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -44,10 +44,6 @@
{
int i, j;
fastf_t halfAxesSize; /* half the length of an axis */
-point_t v2;
-point_t rxv1, rxv2;
-point_t ryv1, ryv2;
-point_t rzv1, rzv2;
point_t ptA, ptB;
int npoints = gdasp-gdas_num_points * 6;
point_t *points;
Modified: brlcad/trunk/src/libdm/dm-Null.c
===
--- brlcad/trunk/src/libdm/dm-Null.c2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm-Null.c2010-02-02 22:17:50 UTC (rev 37530)
@@ -43,7 +43,7 @@
unsigned Nu_unsign(void);
static int Nu_fg(struct dm *, unsigned char, unsigned char, unsigned char,
int strict, fastf_t transparency);
static int Nu_bg(struct dm *, unsigned char, unsigned char, unsigned char);
-static int Nu_dr(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data){};
+static int Nu_dr(struct dm *dmp, struct bn_vlist
*(*callback_function)BU_ARGS((void *)), genptr_t *data){return TCL_OK;};
struct dm dm_Null = {
Nu_int0,
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===
--- brlcad/trunk/src/libdm/dm-wgl.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -294,8 +294,6 @@
/* Make xtkwin a toplevel window */
#if 1
Tcl_DString ds;
- char *cp;
- int ret;
Tcl_DStringInit(ds);
Tcl_DStringAppend(ds, toplevel , -1);
@@ -1249,7 +1247,7 @@
glRasterPos2f(x, y);
glListBase(((struct wgl_vars *)dmp-dm_vars.priv_vars)-fontOffset);
-glCallLists(strlen( str ), GL_UNSIGNED_BYTE, str );
+glCallLists((GLuint)strlen( str ), GL_UNSIGNED_BYTE, str );
return TCL_OK;
}
Modified: brlcad/trunk/src/libdm/dm_obj.c
===
--- brlcad/trunk/src/libdm/dm_obj.c 2010-02-02 21:12:21 UTC (rev 37529)
+++ brlcad/trunk/src/libdm/dm_obj.c 2010-02-02 22:17:50 UTC (rev 37530)
@@ -767,7 +767,6 @@
char **argv)
{
point_t modelAxesPos;
-point_t viewAxesPos;
fastf_t viewSize;
mat_t rmat;
mat_t model2view;
@@ -1313,10 +1312,7 @@
char **argv)
{
int color[3];
-int soffset;
fastf_t viewSize;
-fastf_t x1, x2;
-fastf_t y1, y2;
struct bu_vls vls;
if (argc != 3) {
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
[brlcad-commits] SF.net SVN: brlcad:[37531] brlcad/trunk/src/libfb/if_remote.c
Revision: 37531
http://brlcad.svn.sourceforge.net/brlcad/?rev=37531view=rev
Author: bob1961
Date: 2010-02-02 22:21:41 + (Tue, 02 Feb 2010)
Log Message:
---
Quell a few warnings when compiling 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libfb/if_remote.c
Modified: brlcad/trunk/src/libfb/if_remote.c
===
--- brlcad/trunk/src/libfb/if_remote.c 2010-02-02 22:17:50 UTC (rev 37530)
+++ brlcad/trunk/src/libfb/if_remote.c 2010-02-02 22:21:41 UTC (rev 37531)
@@ -208,7 +208,7 @@
HIDDEN int
rem_open(register FBIO *ifp, register char *file, int width, int height)
{
-register int i;
+register size_t i;
struct pkg_conn *pc;
char buf[128] = {0};
char hostname[MAX_HOSTNAME] = {0};
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
