Revision: 37542
http://brlcad.svn.sourceforge.net/brlcad/?rev=37542&view=rev
Author: bob1961
Date: 2010-02-04 00:46:50 +0000 (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.c 2010-02-04 00:20:29 UTC
(rev 37541)
+++ brlcad/trunk/src/other/libutahrle/inv_cmap.c 2010-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 int length,i;
+ register int i;
+ 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 )
{
#ifndef NO_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 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
