Index: trunk/src/image/miniz.cc
===================================================================
--- trunk/src/image/miniz.cc	(revision 533)
+++ trunk/src/image/miniz.cc	(revision 534)
@@ -1166,5 +1166,5 @@
 			TINFL_GET_BYTE( 1, r->m_zhdr0 ); TINFL_GET_BYTE( 2, r->m_zhdr1 );
 			counter = ( ( ( r->m_zhdr0 * 256 + r->m_zhdr1 ) % 31 != 0 ) || ( r->m_zhdr1 & 32 ) || ( ( r->m_zhdr0 & 15 ) != 8 ) );
-			if ( !( decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF ) ) counter |= ( ( ( 1U << ( 8U + ( r->m_zhdr0 >> 4 ) ) ) > 32768U ) || ( ( out_buf_size_mask + 1 ) < (size_t)( 1U << ( 8U + ( r->m_zhdr0 >> 4 ) ) ) ) );
+			if ( !( decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF ) ) counter |= ( ( ( 1U << ( 8U + ( r->m_zhdr0 >> 4 ) ) ) > 32768U ) || ( ( out_buf_size_mask + 1 ) < (uint32)( 1U << ( 8U + ( r->m_zhdr0 >> 4 ) ) ) ) );
 			if ( counter ) { TINFL_CR_RETURN_FOREVER( 36, TINFL_STATUS_FAILED ); }
 		}
Index: trunk/src/image/png_loader.cc
===================================================================
--- trunk/src/image/png_loader.cc	(revision 533)
+++ trunk/src/image/png_loader.cc	(revision 534)
@@ -1,3 +1,3 @@
-// Copyright (C) 2015-2015 ChaosForge Ltd
+// Copyright (C) 2015-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -251,5 +251,5 @@
 	int remaining()
 	{
-		return m_img_buffer_end - m_img_buffer;
+		return (int)( m_img_buffer_end - m_img_buffer );
 	}
 
@@ -865,5 +865,6 @@
 
 		case STBI__PNG_TYPE( 'I', 'E', 'N', 'D' ): {
-			uint32 raw_len, bpl;
+			size_t raw_len;
+			uint32 bpl;
 			if ( first ) return stbi__err( "first not IHDR", "Corrupt PNG" );
 			if ( scan != STBI__SCAN_load ) return 1;
@@ -882,5 +883,5 @@
 			else
 				s->img_out_n = s->img_n;
-			if ( !stbi__create_png_image( z, z->expanded, raw_len, s->img_out_n, depth, color, interlace ) ) return 0;
+			if ( !stbi__create_png_image( z, z->expanded, int( raw_len ), s->img_out_n, depth, color, interlace ) ) return 0;
 			if ( has_trans )
 				if ( !stbi__compute_transparency( z, tc, s->img_out_n ) ) return 0;
@@ -977,5 +978,5 @@
 static int stbi__stream_read( void *user, char *data, int size )
 {
-	return reinterpret_cast<stream*>( user )->read( data, 1, size );
+	return (int)reinterpret_cast<stream*>( user )->read( data, 1, size );
 }
 
@@ -1022,5 +1023,5 @@
 	if ( stbi__png_info( &s, &x, &y, &comp ) == 1 )
 	{
-		str.seek( pos, origin::SET );
+		str.seek( (long)pos, origin::SET );
 		format.type = UBYTE;
 		switch ( comp )
Index: trunk/src/image/png_writer.cc
===================================================================
--- trunk/src/image/png_writer.cc	(revision 533)
+++ trunk/src/image/png_writer.cc	(revision 534)
@@ -372,5 +372,5 @@
 	ivec2 sz = data->get_size();
 	int len = 0;
-	unsigned char* out = stbi_write_png_to_mem( data->get_data(), 0, sz.x, sz.y, data->get_depth(), &len );
+	unsigned char* out = stbi_write_png_to_mem( data->get_data(), 0, sz.x, sz.y, (int)data->get_depth(), &len );
 	if ( !out ) return false;
 	s.write( out, 1, len );