Skip to content

Commit

Permalink
Another round of warning fixes, this time in VC++
Browse files Browse the repository at this point in the history
  • Loading branch information
codereader committed Jan 28, 2017
1 parent 6554709 commit eebc7bb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions libs/picomodel/lwo/lwio.c
Expand Up @@ -418,7 +418,7 @@ char *sgetS0( unsigned char **bp )
{
char *s;
unsigned char *buf = *bp;
int len;
size_t len;

if ( flen == FLEN_ERROR ) return NULL;

Expand All @@ -436,7 +436,7 @@ char *sgetS0( unsigned char **bp )
}

memcpy( s, buf, len );
flen += len;
flen += (int)len;
*bp += len;
return s;
}
3 changes: 2 additions & 1 deletion libs/picomodel/lwo/pntspols.c
Expand Up @@ -454,7 +454,8 @@ added to the lwTagList array.
int lwGetTags( picoMemStream_t *fp, int cksize, lwTagList *tlist )
{
char *buf, *bp;
int i, len, ntags;
int i, ntags;
size_t len;

if ( cksize == 0 ) return 1;

Expand Down
14 changes: 7 additions & 7 deletions libs/picomodel/picointernal.c
Expand Up @@ -351,7 +351,7 @@ void _pico_expand_bounds( picoVec3_t p, picoVec3_t mins, picoVec3_t maxs )
int i;
for (i=0; i<3; i++)
{
float value = p[i];
double value = p[i];
if (value < mins[i]) mins[i] = value;
if (value > maxs[i]) maxs[i] = value;
}
Expand Down Expand Up @@ -1293,7 +1293,7 @@ void _pico_free_memstream( picoMemStream_t *s )
/* _pico_memstream_read:
* reads data from a pico memorystream into a buffer.
*/
int _pico_memstream_read( picoMemStream_t *s, void *buffer, int len )
int _pico_memstream_read( picoMemStream_t *s, void *buffer, size_t len )
{
int ret = 1;

Expand Down Expand Up @@ -1337,7 +1337,7 @@ int _pico_memstream_getc( picoMemStream_t *s )
*/
int _pico_memstream_seek( picoMemStream_t *s, long offset, int origin )
{
int overflow;
intptr_t overflow;

/* sanity check */
if (s == NULL)
Expand All @@ -1350,7 +1350,7 @@ int _pico_memstream_seek( picoMemStream_t *s, long offset, int origin )
if (overflow > 0)
{
s->curPos = s->buffer + s->bufSize;
return offset - overflow;
return (int)(offset - overflow);
}
return 0;
}
Expand All @@ -1361,7 +1361,7 @@ int _pico_memstream_seek( picoMemStream_t *s, long offset, int origin )
if (overflow > 0)
{
s->curPos = s->buffer + s->bufSize;
return offset - overflow;
return (int)(offset - overflow);
}
return 0;
}
Expand All @@ -1372,7 +1372,7 @@ int _pico_memstream_seek( picoMemStream_t *s, long offset, int origin )
if (overflow > 0)
{
s->curPos = s->buffer;
return offset - overflow;
return (int)(offset - overflow);
}
return 0;
}
Expand All @@ -1389,5 +1389,5 @@ long _pico_memstream_tell( picoMemStream_t *s )
if (s == NULL)
return -1;

return s->curPos - s->buffer;
return (long)(s->curPos - s->buffer);
}
2 changes: 1 addition & 1 deletion libs/picomodel/picointernal.h
Expand Up @@ -193,7 +193,7 @@ int _pico_parse_vec4_def( picoParser_t *p, picoVec4_t out, picoVec4_t def);
/* pico memory stream */
picoMemStream_t *_pico_new_memstream( picoByte_t *buffer, int bufSize );
void _pico_free_memstream( picoMemStream_t *s );
int _pico_memstream_read( picoMemStream_t *s, void *buffer, int len );
int _pico_memstream_read( picoMemStream_t *s, void *buffer, size_t len );
int _pico_memstream_getc( picoMemStream_t *s );
int _pico_memstream_seek( picoMemStream_t *s, long offset, int origin );
long _pico_memstream_tell( picoMemStream_t *s );
Expand Down

0 comments on commit eebc7bb

Please sign in to comment.