[brlcad-commits] SF.net SVN: brlcad:[37536] brlcad/trunk/src/liboptical
Revision: 37536
http://brlcad.svn.sourceforge.net/brlcad/?rev=37536view=rev
Author: bob1961
Date: 2010-02-03 23:00:17 + (Wed, 03 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/liboptical/material.c
brlcad/trunk/src/liboptical/sh_stxt.c
brlcad/trunk/src/liboptical/shade.c
Modified: brlcad/trunk/src/liboptical/material.c
===
--- brlcad/trunk/src/liboptical/material.c 2010-02-03 22:27:04 UTC (rev
37535)
+++ brlcad/trunk/src/liboptical/material.c 2010-02-03 23:00:17 UTC (rev
37536)
@@ -219,7 +219,7 @@
intret;
struct bu_vls param;
const char *material;
-intmlen;
+size_t mlen;
RT_CK_REGION(rp);
RT_CK_RTI(rtip);
Modified: brlcad/trunk/src/liboptical/sh_stxt.c
===
--- brlcad/trunk/src/liboptical/sh_stxt.c 2010-02-03 22:27:04 UTC (rev
37535)
+++ brlcad/trunk/src/liboptical/sh_stxt.c 2010-02-03 23:00:17 UTC (rev
37536)
@@ -140,7 +140,7 @@
linebuf = bu_malloc(stp-stx_fw*3, texture file line);
for ( i = 0; i stp-stx_n; i++ ) {
- if ((rd = fread(linebuf, 1, stp-stx_fw*3, fp)) != stp-stx_fw*3 ) {
+ if ((rd = (int)fread(linebuf, 1, stp-stx_fw*3, fp)) !=
stp-stx_fw*3 ) {
bu_log(stxt_read: read error on %s\n, name);
stp-stx_file[0] = '\0';
(void)fclose(fp);
Modified: brlcad/trunk/src/liboptical/shade.c
===
--- brlcad/trunk/src/liboptical/shade.c 2010-02-03 22:27:04 UTC (rev 37535)
+++ brlcad/trunk/src/liboptical/shade.c 2010-02-03 23:00:17 UTC (rev 37536)
@@ -57,7 +57,7 @@
int i;
if (!swp)
- return
+ return;
bu_log(Shadework%s: 0x%x\n, str ? str : , swp);
bu_printb( sw_inputs, swp-sw_inputs, MFI_FORMAT);
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:[37537] brlcad/trunk/include/bu.h
Revision: 37537 http://brlcad.svn.sourceforge.net/brlcad/?rev=37537view=rev Author: bob1961 Date: 2010-02-03 23:37:48 + (Wed, 03 Feb 2010) Log Message: --- Quell a few warnings when compiling for 64-bit Windows. Modified Paths: -- brlcad/trunk/include/bu.h Modified: brlcad/trunk/include/bu.h === --- brlcad/trunk/include/bu.h 2010-02-03 23:00:17 UTC (rev 37536) +++ brlcad/trunk/include/bu.h 2010-02-03 23:37:48 UTC (rev 37537) @@ -1806,7 +1806,11 @@ #endif # else /* Conservative way of finding # bytes as diff of 2 char ptrs */ -#define bu_byteoffset(_i) ((size_t)(((char *)(_i))-((char *)0))) +#if defined(_WIN32) !defined(__CYGWIN__) +# define bu_byteoffset(_i)((long)(((char *)(_i))-((char *)0))) +#else +# define bu_byteoffset(_i)((size_t)(((char *)(_i))-((char *)0))) +#endif # endif #endif # 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:[37538] brlcad/trunk/src/libpkg/pkg.c
Revision: 37538
http://brlcad.svn.sourceforge.net/brlcad/?rev=37538view=rev
Author: bob1961
Date: 2010-02-03 23:41:40 + (Wed, 03 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libpkg/pkg.c
Modified: brlcad/trunk/src/libpkg/pkg.c
===
--- brlcad/trunk/src/libpkg/pkg.c 2010-02-03 23:37:48 UTC (rev 37537)
+++ brlcad/trunk/src/libpkg/pkg.c 2010-02-03 23:41:40 UTC (rev 37538)
@@ -94,8 +94,8 @@
* compatibility macros should take care of this.
*/
#ifdef HAVE_WINSOCK_H
-# define PKG_READ(d, buf, nbytes) recv((d), (buf), (nbytes), 0)
-# define PKG_SEND(d, buf, nbytes) send((d), (buf), (nbytes), 0)
+# define PKG_READ(d, buf, nbytes) recv((d), (buf), (int)(nbytes), 0)
+# define PKG_SEND(d, buf, nbytes) send((d), (buf), (int)(nbytes), 0)
#else
# define PKG_READ(d, buf, nbytes) read((d), (buf), (nbytes))
# define PKG_SEND(d, buf, nbytes) write((d), (buf), (nbytes))
@@ -117,8 +117,9 @@
# define DMSG(s) /**/
#endif
-
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern int errno;
+#endif
int pkg_nochecking = 0;/* set to disable extra checking for input */
int pkg_permport = 0; /* TCP port that pkg_permserver() is listening on XXX */
@@ -851,9 +852,9 @@
/* Input Buffer has some data in it, move to caller's buffer */
if ((int)len todo) len = todo;
memcpy(buf, pc-pkc_inbuf[pc-pkc_incur], len);
- pc-pkc_incur += len;
+ pc-pkc_incur += (int)len;
buf += len;
- todo -= len;
+ todo -= (int)len;
}
return(count);
}
@@ -1005,7 +1006,7 @@
(pc-pkc_errlog)(_pkg_errbuf);
return(i-sizeof(hdr)); /* amount of user data sent */
}
- return(len);
+ return((int)len);
}
/* Send them separately */
if ((i = PKG_SEND(pc-pkc_fd, (char *)hdr, sizeof(hdr))) != sizeof(hdr)) {
@@ -1031,7 +1032,7 @@
return(i); /* amount of user data sent */
}
#endif
-return(len);
+return((int)len);
}
@@ -1122,7 +1123,7 @@
(pc-pkc_errlog)(_pkg_errbuf);
return(i-sizeof(hdr)); /* amount of user data sent */
}
- return(len1+len2);
+ return((int)(len1+len2));
}
/* Send it in three pieces */
if ((i = PKG_SEND(pc-pkc_fd, (char *)hdr, sizeof(hdr))) != sizeof(hdr)) {
@@ -1166,10 +1167,10 @@
snprintf(_pkg_errbuf, MAX_PKG_ERRBUF_SIZE, pkg_2send of %d+%d+%d,
wrote len2=%d\n,
(int)sizeof(hdr), len1, len2, i);
(pc-pkc_errlog)(_pkg_errbuf);
- return(len1+i); /* amount of user data sent */
+ return((int)(len1+i)); /* amount of user data sent */
}
#endif
-return(len1+len2);
+return((int)(len1+len2));
}
@@ -1200,7 +1201,7 @@
memcpy((pc-pkc_stream[pc-pkc_strpos]), (char *)hdr, sizeof(struct
pkg_header));
pc-pkc_strpos += sizeof(struct pkg_header);
memcpy((pc-pkc_stream[pc-pkc_strpos]), buf, len);
-pc-pkc_strpos += len;
+pc-pkc_strpos += (int)len;
return((int)(len + sizeof(struct pkg_header)));
}
@@ -1299,7 +1300,7 @@
pc-pkc_type = pkg_gshort((char *)pc-pkc_hdr.pkh_type); /* host order */
pc-pkc_len = pkg_glong((char *)pc-pkc_hdr.pkh_len);
pc-pkc_buf = (char *)0;
-pc-pkc_left = pc-pkc_len;
+pc-pkc_left = (int)pc-pkc_len;
if (pc-pkc_left == 0) return(1); /* msg here, no data */
if (buf) {
@@ -1404,7 +1405,7 @@
pc-pkc_buf = (char *)0;
pc-pkc_curpos = (char *)0;
pc-pkc_left = -1; /* safety */
-return(pc-pkc_len);
+return((int)pc-pkc_len);
}
@@ -1585,7 +1586,7 @@
}
len = _pkg_inget(pc, pc-pkc_curpos, len);
pc-pkc_curpos += len;
- pc-pkc_left -= len;
+ pc-pkc_left -= (int)len;
if (pc-pkc_left 0) {
/*
* Input buffer is exhausted, but more data is needed
@@ -1699,13 +1700,13 @@
/* If cur point is near end of buffer, recopy data to buffer front */
if (pc-pkc_incur = (pc-pkc_inlen * 7) / 8) {
- size_t ammount;
+ size_t amount;
- ammount = pc-pkc_inend - pc-pkc_incur;
+ amount = pc-pkc_inend - pc-pkc_incur;
/* This copy can not overlap itself, because of 7/8 above */
- memcpy(pc-pkc_inbuf, pc-pkc_inbuf[pc-pkc_incur], ammount);
+ memcpy(pc-pkc_inbuf, pc-pkc_inbuf[pc-pkc_incur], amount);
pc-pkc_incur = 0;
- pc-pkc_inend = ammount;
+ pc-pkc_inend = (int)amount;
}
/* If remaining buffer space is small, make buffer bigger */
@@ -1759,7 +1760,7 @@
}
if (got (int)avail) {
pc-pkc_errlog(pkg_suckin: read more bytes than desired\n);
- got = avail;
+ got = (int)avail;
}
pc-pkc_inend += got;
ret = 1;
This was sent by the
[brlcad-commits] SF.net SVN: brlcad:[37539] brlcad/trunk/src/other/libpng
Revision: 37539
http://brlcad.svn.sourceforge.net/brlcad/?rev=37539view=rev
Author: bob1961
Date: 2010-02-04 00:02:57 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/other/libpng/pngpread.c
brlcad/trunk/src/other/libpng/pngrutil.c
brlcad/trunk/src/other/libpng/pngset.c
brlcad/trunk/src/other/libpng/pngwio.c
brlcad/trunk/src/other/libpng/pngwutil.c
Modified: brlcad/trunk/src/other/libpng/pngpread.c
===
--- brlcad/trunk/src/other/libpng/pngpread.c2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngpread.c2010-02-04 00:02:57 UTC (rev
37539)
@@ -526,7 +526,7 @@
png_calculate_crc(png_ptr, png_ptr-save_buffer_ptr, save_size);
- png_ptr-skip_length -= save_size;
+ png_ptr-skip_length -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-save_buffer_size -= save_size;
png_ptr-save_buffer_ptr += save_size;
@@ -542,7 +542,7 @@
png_calculate_crc(png_ptr, png_ptr-current_buffer_ptr, save_size);
- png_ptr-skip_length -= save_size;
+ png_ptr-skip_length -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-current_buffer_size -= save_size;
png_ptr-current_buffer_ptr += save_size;
@@ -707,7 +707,7 @@
png_calculate_crc(png_ptr, png_ptr-save_buffer_ptr, save_size);
if (!(png_ptr-flags PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr-save_buffer_ptr, save_size);
- png_ptr-idat_size -= save_size;
+ png_ptr-idat_size -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-save_buffer_size -= save_size;
png_ptr-save_buffer_ptr += save_size;
@@ -730,7 +730,7 @@
if (!(png_ptr-flags PNG_FLAG_ZLIB_FINISHED))
png_process_IDAT_data(png_ptr, png_ptr-current_buffer_ptr, save_size);
- png_ptr-idat_size -= save_size;
+ png_ptr-idat_size -= (png_uint_32)save_size;
png_ptr-buffer_size -= save_size;
png_ptr-current_buffer_size -= save_size;
png_ptr-current_buffer_ptr += save_size;
@@ -1277,9 +1277,8 @@
png_charp tmp;
tmp = text;
- text = (png_charp)png_malloc(png_ptr, text_size +
- (png_uint_32)(png_ptr-zbuf_size
- - png_ptr-zstream.avail_out + 1));
+ text = (png_charp)png_malloc(png_ptr, (png_uint_32)(text_size +
+ png_ptr-zbuf_size - png_ptr-zstream.avail_out +
1));
png_memcpy(text, tmp, text_size);
png_free(png_ptr, tmp);
png_memcpy(text + text_size, png_ptr-zbuf,
Modified: brlcad/trunk/src/other/libpng/pngrutil.c
===
--- brlcad/trunk/src/other/libpng/pngrutil.c2010-02-03 23:41:40 UTC (rev
37538)
+++ brlcad/trunk/src/other/libpng/pngrutil.c2010-02-04 00:02:57 UTC (rev
37539)
@@ -251,7 +251,7 @@
if (text == NULL)
{
text_size = prefix_size + png_sizeof(msg) + 1;
- text = (png_charp)png_malloc_warn(png_ptr, text_size);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -277,7 +277,7 @@
{
text_size = prefix_size +
png_ptr-zbuf_size - png_ptr-zstream.avail_out;
- text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+ text = (png_charp)png_malloc_warn(png_ptr,
(png_uint_32)text_size + 1);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -347,7 +347,7 @@
text_size = prefix_size;
if (text == NULL)
{
-text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+ text = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)text_size+1);
if (text == NULL)
{
png_free(png_ptr, png_ptr-chunkdata);
@@ -1067,7 +1067,7 @@
png_decompress_chunk(png_ptr, compression_type,
slength, prefix_length, data_length);
- profile_length = data_length - prefix_length;
+ profile_length = (png_uint_32)(data_length - prefix_length);
if ( prefix_length data_length || profile_length 4)
{
@@ -1166,7 +1166,7 @@
new_palette.depth = *entry_start++;
entry_size = (new_palette.depth == 8 ? 6 : 10);
- data_length = (slength - (entry_start - (png_bytep)png_ptr-chunkdata));
+ data_length = (int)(slength - (entry_start -
(png_bytep)png_ptr-chunkdata));
/* integrity-check the data length */
if (data_length % entry_size)
@@ -3187,9 +3187,9 @@
if (row_bytes + 64
[brlcad-commits] SF.net SVN: brlcad:[37540] brlcad/trunk/src/other/libregex/regcomp.c
Revision: 37540 http://brlcad.svn.sourceforge.net/brlcad/?rev=37540view=rev Author: bob1961 Date: 2010-02-04 00:11:54 + (Thu, 04 Feb 2010) Log Message: --- Quell a few warnings when compiling for 64-bit Windows. Modified Paths: -- brlcad/trunk/src/other/libregex/regcomp.c Modified: brlcad/trunk/src/other/libregex/regcomp.c === --- brlcad/trunk/src/other/libregex/regcomp.c 2010-02-04 00:02:57 UTC (rev 37539) +++ brlcad/trunk/src/other/libregex/regcomp.c 2010-02-04 00:11:54 UTC (rev 37540) @@ -1478,7 +1478,7 @@ assert(p-slen p-ssize); /* finally, it's all reduced to the easy case */ - p-strip[p-slen++] = SOP(op, opnd); + p-strip[p-slen++] = SOP(op, (sop)opnd); } /* 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:[37542] brlcad/trunk/src/other/libutahrle
Revision: 37542
http://brlcad.svn.sourceforge.net/brlcad/?rev=37542view=rev
Author: bob1961
Date: 2010-02-04 00:46:50 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/other/libutahrle/Runput.c
brlcad/trunk/src/other/libutahrle/colorquant.c
brlcad/trunk/src/other/libutahrle/inv_cmap.c
brlcad/trunk/src/other/libutahrle/rle_addhist.c
brlcad/trunk/src/other/libutahrle/rle_hdr.c
brlcad/trunk/src/other/libutahrle/rle_open_f.c
Modified: brlcad/trunk/src/other/libutahrle/Runput.c
===
--- brlcad/trunk/src/other/libutahrle/Runput.c 2010-02-04 00:20:29 UTC (rev
37541)
+++ brlcad/trunk/src/other/libutahrle/Runput.c 2010-02-04 00:46:50 UTC (rev
37542)
@@ -247,7 +247,7 @@
/* Get the total length of comments */
comlen = 0;
for ( com_p = the_hdr-comments; *com_p != NULL; com_p++ )
- comlen += 1 + strlen( *com_p );
+ comlen += 1 + (int)strlen( *com_p );
put16( comlen );
for ( com_p = the_hdr-comments; *com_p != NULL; com_p++ )
Modified: brlcad/trunk/src/other/libutahrle/colorquant.c
===
--- brlcad/trunk/src/other/libutahrle/colorquant.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/colorquant.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -88,6 +88,7 @@
*/
static char rcsid[] = $Header$;
+#include stdlib.h
#include math.h
#include stdio.h
#include rle_config.h
Modified: brlcad/trunk/src/other/libutahrle/inv_cmap.c
===
--- brlcad/trunk/src/other/libutahrle/inv_cmap.c2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/inv_cmap.c2010-02-04 00:46:50 UTC
(rev 37542)
@@ -483,7 +483,8 @@
int detect;
register unsigned long *dp;
register unsigned char *rgbp;
-register long bdist, bxx;
+register unsigned long bdist;
+register long bxx;
register int b, i = cindex;
register long txsqr = xsqr + xsqr;
register int lim;
Modified: brlcad/trunk/src/other/libutahrle/rle_addhist.c
===
--- brlcad/trunk/src/other/libutahrle/rle_addhist.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/rle_addhist.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -55,7 +55,8 @@
register char *argv[];
rle_hdr *in_hdr,*out_hdr;
{
- register intlength,i;
+ register inti;
+ register size_t length;
time_t temp;
/* padding must give number of characters in histoire */
/* plus one for = */
Modified: brlcad/trunk/src/other/libutahrle/rle_hdr.c
===
--- brlcad/trunk/src/other/libutahrle/rle_hdr.c 2010-02-04 00:20:29 UTC (rev
37541)
+++ brlcad/trunk/src/other/libutahrle/rle_hdr.c 2010-02-04 00:46:50 UTC (rev
37542)
@@ -180,7 +180,7 @@
size *= sizeof(char *);
to_hdr-comments = (CONST_DECL char **)malloc( size );
RLE_CHECK_ALLOC( to_hdr-cmd, to_hdr-comments, comments );
- bcopy( from_hdr-comments, to_hdr-comments, size );
+ bcopy( (const void *)from_hdr-comments, (void *)to_hdr-comments,
size );
}
else
to_hdr-comments = NULL;/* Blow off empty comment list. */
@@ -236,7 +236,7 @@
the_hdr-cmap = 0;
/* Unfortunately, we don't know how to free the comment memory. */
if ( the_hdr-comments )
- free( the_hdr-comments );
+ free( (void *)the_hdr-comments );
the_hdr-comments = 0;
}
}
Modified: brlcad/trunk/src/other/libutahrle/rle_open_f.c
===
--- brlcad/trunk/src/other/libutahrle/rle_open_f.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/rle_open_f.c 2010-02-04 00:46:50 UTC
(rev 37542)
@@ -61,9 +61,6 @@
FILE *fp;
void perror();
CONST_DECL char *err_str;
-register char *cp;
-char *combuf;
-size_t combuf_size;
#ifdef STDIO_NEEDS_BINARY
char mode_string[32]; /* Should be enough. */
@@ -83,6 +80,10 @@
if ( file_name != NULL strcmp( file_name, - ) != 0 )
{
#ifndefNO_OPEN_PIPES
+ register char *cp;
+ char *combuf;
+ size_t combuf_size;
+
/* Check for dead children. */
if ( catching_children 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
[brlcad-commits] SF.net SVN: brlcad:[37545] brlcad/trunk/src/conv/asc/asc2g.c
Revision: 37545
http://brlcad.svn.sourceforge.net/brlcad/?rev=37545view=rev
Author: bob1961
Date: 2010-02-04 00:55:38 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/conv/asc/asc2g.c
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===
--- brlcad/trunk/src/conv/asc/asc2g.c 2010-02-04 00:54:35 UTC (rev 37544)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2010-02-04 00:55:38 UTC (rev 37545)
@@ -1697,7 +1697,6 @@
int
main(int argc, char *argv[])
{
-char c1[3];
struct bu_vls str_title;
struct bu_vls str_put;
struct bu_vls line;
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:[37544] brlcad/trunk/misc/win32-msvc8
Revision: 37544
http://brlcad.svn.sourceforge.net/brlcad/?rev=37544view=rev
Author: bob1961
Date: 2010-02-04 00:54:35 + (Thu, 04 Feb 2010)
Log Message:
---
More updates
Modified Paths:
--
brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln
brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj
Modified: brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln
===
--- brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/brlcad/brlcad.sln 2010-02-04 00:54:35 UTC
(rev 37544)
@@ -1319,6 +1319,7 @@
{2794FD11-F9A6-4145-92DE-A05F5A2E6361} =
{2794FD11-F9A6-4145-92DE-A05F5A2E6361}
{EA0BB405-25E2-4B31-92D7-97316770F32B} =
{EA0BB405-25E2-4B31-92D7-97316770F32B}
{333C38B9-BD2E-4D34-98DD-69E9B5E56ECB} =
{333C38B9-BD2E-4D34-98DD-69E9B5E56ECB}
+ {65AE6C9B-AFA3-46FB-BB13-ED37D6E0042E} =
{65AE6C9B-AFA3-46FB-BB13-ED37D6E0042E}
EndProjectSection
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = tire,
..\tire\tire.vcproj, {D4B7A4C2-1029-4273-8DA1-232668DD7B0F}
@@ -1635,6 +1636,13 @@
Debug.AspNetCompiler.Debug = True
Release.AspNetCompiler.Debug = False
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ {EA0BB405-25E2-4B31-92D7-97316770F32B} =
{EA0BB405-25E2-4B31-92D7-97316770F32B}
+ {2794FD11-F9A6-4145-92DE-A05F5A2E6361} =
{2794FD11-F9A6-4145-92DE-A05F5A2E6361}
+ {39172035-CC5F-4140-9118-E1A9AD311FC7} =
{39172035-CC5F-4140-9118-E1A9AD311FC7}
+ {D2A218BF-FAB3-4BEA-B288-E357FE003E29} =
{D2A218BF-FAB3-4BEA-B288-E357FE003E29}
+ {9C2287FD-4991-493F-81A4-41CAA48565CE} =
{9C2287FD-4991-493F-81A4-41CAA48565CE}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/libged/libged.vcproj 2010-02-04 00:54:35 UTC
(rev 37544)
@@ -181,7 +181,7 @@
/
Tool
Name=VCLinkerTool
- AdditionalDependencies=tcl85.lib libbu.lib
libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib
libpng.lib ws2_32.lib
+ AdditionalDependencies=tcl85.lib libbu.lib
libbn.lib libsysv.lib libregex.lib opennurbs.lib librt.lib libwdb.lib
libanalyze.lib libpng.lib ws2_32.lib
OutputFile=.\$(PlatformName)\$(ConfigurationName)/libged.dll
LinkIncremental=1
SuppressStartupBanner=true
Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-02-04 00:48:55 UTC
(rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj2010-02-04 00:54:35 UTC
(rev 37544)
@@ -496,6 +496,10 @@
/File
File
+
RelativePath=..\..\..\src\librt\primitives\generic.c
+
+ /File
+ File
RelativePath=..\..\..\src\librt\globals.c
/File
Modified: brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj
===
--- brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-02-04
00:48:55 UTC (rev 37543)
+++ brlcad/trunk/misc/win32-msvc8/opennurbs/opennurbs.vcproj2010-02-04
00:54:35 UTC (rev 37544)
@@ -142,7 +142,7 @@
InlineFunctionExpansion=1
EnableIntrinsicFunctions=false
AdditionalIncludeDirectories=../../../include;../../../src/other/libz;../../../src/other/tcl/generic;../../../src/other/tcl/win
-
PreprocessorDefinitions=WIN32;NDEBUG;_WINDOWS;_USRDLL;ON_DLL_EXPORTS;ON_COMPILING_OPENNURBS;_CRT_SECURE_NO_WARNINGS
+
PreprocessorDefinitions=WIN64;_M_X64;NDEBUG;_WINDOWS;_USRDLL;ON_DLL_EXPORTS;ON_COMPILING_OPENNURBS;_CRT_SECURE_NO_WARNINGS
StringPooling=true
ExceptionHandling=1
RuntimeLibrary=2
This was sent by the
[brlcad-commits] SF.net SVN: brlcad:[37543] brlcad/trunk/src/libwdb/wdb.c
Revision: 37543
http://brlcad.svn.sourceforge.net/brlcad/?rev=37543view=rev
Author: bob1961
Date: 2010-02-04 00:48:55 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libwdb/wdb.c
Modified: brlcad/trunk/src/libwdb/wdb.c
===
--- brlcad/trunk/src/libwdb/wdb.c 2010-02-04 00:46:50 UTC (rev 37542)
+++ brlcad/trunk/src/libwdb/wdb.c 2010-02-04 00:48:55 UTC (rev 37543)
@@ -344,9 +344,6 @@
mk_hyp(struct rt_wdb *wdbp, const char *name, const point_t vertex, const
vect_t height_vector, const vect_t vectA, fastf_t magB, fastf_t base_neck_ratio)
{
struct rt_hyp_internal *hyp;
-vect_t inH, inAu;
-vect_t unit_H;
-
BU_GETSTRUCT( hyp, rt_hyp_internal );
hyp-hyp_magic = RT_HYP_INTERNAL_MAGIC;
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:[37541] brlcad/trunk/src/libtclcad
Revision: 37541
http://brlcad.svn.sourceforge.net/brlcad/?rev=37541view=rev
Author: bob1961
Date: 2010-02-04 00:20:29 + (Thu, 04 Feb 2010)
Log Message:
---
Quell a few warnings when compiling for 64-bit Windows.
Modified Paths:
--
brlcad/trunk/src/libtclcad/ged_obj.c
brlcad/trunk/src/libtclcad/tclcadAutoPath.c
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2010-02-04 00:11:54 UTC (rev
37540)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2010-02-04 00:20:29 UTC (rev
37541)
@@ -2250,7 +2250,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2499,7 +2498,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2662,7 +2660,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2894,7 +2891,6 @@
}
if (argc == 4) {
- int ret;
int ac;
const char **av;
@@ -2963,7 +2959,6 @@
const char *usage,
int maxargs)
{
-register int i;
int mx, my;
int dindex;
fastf_t cx, cy;
Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2010-02-04 00:11:54 UTC (rev
37540)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2010-02-04 00:20:29 UTC (rev
37541)
@@ -56,7 +56,9 @@
#define MAX_BUF 2048
/* FIXME: we utilize this Tcl internal in here */
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern Tcl_Obj *TclGetLibraryPath (void);
+#endif
/* helper routine to determine whether the full 'path' includes a
@@ -220,13 +222,13 @@
char *cp;
if (root != (char *)0) {
- for (cp = root; *cp != '\0'; ++cp)
+ for (cp = (char *)root; *cp != '\0'; ++cp)
if (*cp == '\\')
*cp = '/';
}
if (data != (char *)0) {
- for (cp = data; *cp != '\0'; ++cp)
+ for (cp = (char *)data; *cp != '\0'; ++cp)
if (*cp == '\\')
*cp = '/';
}
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:[37546] brlcad/trunk/src/libbu/parallel.c
Revision: 37546
http://brlcad.svn.sourceforge.net/brlcad/?rev=37546view=rev
Author: brlcad
Date: 2010-02-04 04:03:58 + (Thu, 04 Feb 2010)
Log Message:
---
quell unused parameter warning
Modified Paths:
--
brlcad/trunk/src/libbu/parallel.c
Modified: brlcad/trunk/src/libbu/parallel.c
===
--- brlcad/trunk/src/libbu/parallel.c 2010-02-04 00:55:38 UTC (rev 37545)
+++ brlcad/trunk/src/libbu/parallel.c 2010-02-04 04:03:58 UTC (rev 37546)
@@ -186,7 +186,7 @@
#else /* !HAVE_SETPRIORITY */
/* no known means to change the nice value */
if (bu_debug) {
- bu_log(bu_nice_set() Priority NOT changed\n);
+ bu_log(bu_nice_set(%d) Priority NOT changed\n, newnice);
}
#endif /* _WIN32 */
}
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:[37549] brlcad/trunk/src/libpkg/pkg.c
Revision: 37549 http://brlcad.svn.sourceforge.net/brlcad/?rev=37549view=rev Author: brlcad Date: 2010-02-04 06:06:17 + (Thu, 04 Feb 2010) Log Message: --- quell warning about converting a pid_t to a %d specifier. instead, cast the result from pid_t to an int for quellage. Modified Paths: -- brlcad/trunk/src/libpkg/pkg.c Modified: brlcad/trunk/src/libpkg/pkg.c === --- brlcad/trunk/src/libpkg/pkg.c 2010-02-04 05:55:36 UTC (rev 37548) +++ brlcad/trunk/src/libpkg/pkg.c 2010-02-04 06:06:17 UTC (rev 37549) @@ -201,7 +201,7 @@ tmp-tm_hour, tmp-tm_min, tmp-tm_sec, /* avoid libbu dependency */ #ifdef HAVE_UNISTD_H - getpid() + (int)getpid() #else (int)GetCurrentProcessId() #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:[37548] brlcad/trunk
Revision: 37548 http://brlcad.svn.sourceforge.net/brlcad/?rev=37548view=rev Author: brlcad Date: 2010-02-04 05:55:36 + (Thu, 04 Feb 2010) Log Message: --- bump the version numer to 7.16.6 in preparation for release (no non-bugfix changes until tagged (later today)) Modified Paths: -- brlcad/trunk/NEWS brlcad/trunk/include/conf/PATCH brlcad/trunk/src/archer/archer.bat brlcad/trunk/src/mged/mged.bat brlcad/trunk/src/util/rtwizard.bat Modified: brlcad/trunk/NEWS === --- brlcad/trunk/NEWS 2010-02-04 05:48:43 UTC (rev 37547) +++ brlcad/trunk/NEWS 2010-02-04 05:55:36 UTC (rev 37548) @@ -10,7 +10,7 @@ changes made. See document footer for additional details. -- 2010-0x-xx Release 7.16.6 --- +--- 2010-01-04 Release 7.16.6 --- -- Considerable effort continues towards improving BRL-CAD's Modified: brlcad/trunk/include/conf/PATCH === --- brlcad/trunk/include/conf/PATCH 2010-02-04 05:48:43 UTC (rev 37547) +++ brlcad/trunk/include/conf/PATCH 2010-02-04 05:55:36 UTC (rev 37548) @@ -1 +1 @@ -5 +6 Modified: brlcad/trunk/src/archer/archer.bat === --- brlcad/trunk/src/archer/archer.bat 2010-02-04 05:48:43 UTC (rev 37547) +++ brlcad/trunk/src/archer/archer.bat 2010-02-04 05:55:36 UTC (rev 37548) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.16.5 +SET CAD_VERSION=7.16.6 SET SAVE_CD=%CD% SET PATH=%~dp0 Modified: brlcad/trunk/src/mged/mged.bat === --- brlcad/trunk/src/mged/mged.bat 2010-02-04 05:48:43 UTC (rev 37547) +++ brlcad/trunk/src/mged/mged.bat 2010-02-04 05:55:36 UTC (rev 37548) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.16.5 +SET CAD_VERSION=7.16.6 SET SAVE_CD=%CD% SET PATH=%~dp0 Modified: brlcad/trunk/src/util/rtwizard.bat === --- brlcad/trunk/src/util/rtwizard.bat 2010-02-04 05:48:43 UTC (rev 37547) +++ brlcad/trunk/src/util/rtwizard.bat 2010-02-04 05:55:36 UTC (rev 37548) @@ -23,7 +23,7 @@ SETLOCAL REM XXX FIXME: SHOULD NOT NEED TO SET BRLCAD_DATA OR CAD_VERSION XXX -SET CAD_VERSION=7.16.5 +SET CAD_VERSION=7.16.6 SET SAVE_CD=%CD% SET PATH=%~dp0 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
