From eebc7bbec0a532bf6c711216995e0de8c6b9b208 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sat, 28 Jan 2017 10:36:37 +0100
Subject: [PATCH] Another round of warning fixes, this time in VC++

---
 libs/picomodel/lwo/lwio.c     |  4 ++--
 libs/picomodel/lwo/pntspols.c |  3 ++-
 libs/picomodel/picointernal.c | 14 +++++++-------
 libs/picomodel/picointernal.h |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libs/picomodel/lwo/lwio.c b/libs/picomodel/lwo/lwio.c
index 8bd9d45e50..22e19b9680 100644
--- a/libs/picomodel/lwo/lwio.c
+++ b/libs/picomodel/lwo/lwio.c
@@ -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;
 
@@ -436,7 +436,7 @@ char *sgetS0( unsigned char **bp )
    }
 
    memcpy( s, buf, len );
-   flen += len;
+   flen += (int)len;
    *bp += len;
    return s;
 }
diff --git a/libs/picomodel/lwo/pntspols.c b/libs/picomodel/lwo/pntspols.c
index 784f1b4d2f..4d34ca1f2b 100644
--- a/libs/picomodel/lwo/pntspols.c
+++ b/libs/picomodel/lwo/pntspols.c
@@ -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;
 
diff --git a/libs/picomodel/picointernal.c b/libs/picomodel/picointernal.c
index a46d0f33ef..4b222fd98b 100644
--- a/libs/picomodel/picointernal.c
+++ b/libs/picomodel/picointernal.c
@@ -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;
 	}
@@ -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;
 
@@ -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)
@@ -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;
 	}
@@ -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;
 	}
@@ -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;
 	}
@@ -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);
 }
diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h
index 8fe121bb84..4154f29705 100644
--- a/libs/picomodel/picointernal.h
+++ b/libs/picomodel/picointernal.h
@@ -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 );