remove warnings

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6373 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CXMLReaderImpl.h

@@ -646,7 +646,7 @@ private:
 	\param sizeWithoutHeader: Text size in characters without header
 	*/
 	template<class src_char_type>
-	void convertTextData(src_char_type* source, char* pointerToStore, int sizeWithoutHeader)
+	void convertTextData(src_char_type* source, char* pointerToStore, long sizeWithoutHeader)
 	{
 		// convert little to big endian if necessary
 		if (sizeof(src_char_type) > 1 &&

source/Irrlicht/CXMLWriter.cpp

@@ -207,7 +207,7 @@ void CXMLWriter::writeText(const wchar_t* text)
 	// Making a member-variable would work, but a lot of memory would stay around after writing.
 	// So the correct solution is probably using fixed block here and always write when that is full.
 	core::stringw s;
-	s.reserve(wcslen(text)+1);
+	s.reserve((u32)wcslen(text)+1);
 	const wchar_t* p = text;
 
 	while(*p)
@@ -424,7 +424,7 @@ void CXMLWriterUTF8::writeText(const c8* text)
 	// Making a member-variable would work, but a lot of memory would stay around after writing.
 	// So the correct solution is probably using fixed block here and always write when that is full.
 	core::stringc s;
-	s.reserve(strlen(text)+1);
+	s.reserve((u32)strlen(text)+1);
 	const c8* p = text;
 
 	while(*p)

source/Irrlicht/CZipReader.cpp

@@ -809,7 +809,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 					pcData+4, propSize,
 					e.header.GeneralBitFlag&0x1?LZMA_FINISH_END:LZMA_FINISH_ANY, &status,
 					&lzmaAlloc);
-			uncompressedSize = tmpDstSize; // may be different to expected value
+			uncompressedSize = (u32)tmpDstSize; // may be different to expected value
 
 			if (decrypted)
 				decrypted->drop();

source/Irrlicht/jpeglib/jdatadst.c

@@ -182,7 +182,7 @@ term_mem_destination (j_compress_ptr cinfo)
   my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
 
   *dest->outbuffer = dest->buffer;
-  *dest->outsize = dest->bufsize - dest->pub.free_in_buffer;
+  *dest->outsize = (unsigned long)(dest->bufsize - dest->pub.free_in_buffer);
 }
 
 

source/Irrlicht/jpeglib/jmemmgr.c

@@ -130,7 +130,7 @@ typedef struct {
   jvirt_barray_ptr virt_barray_list;
 
   /* This counts total space obtained from jpeg_get_small/large */
-  long total_space_allocated;
+  size_t total_space_allocated;
 
   /* alloc_sarray and alloc_barray set this value for use by virtual
    * array routines.
@@ -618,7 +618,7 @@ realize_virt_arrays (j_common_ptr cinfo)
 
   /* Determine amount of memory to actually use; this is system-dependent. */
   avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
-				 mem->total_space_allocated);
+				 (long)mem->total_space_allocated);
 
   /* If the maximum space needed is available, make all the buffers full
    * height; otherwise parcel it out with the same number of minheights

tools/GUIEditor/CMemoryReadWriteFile.cpp

@@ -21,12 +21,12 @@ size_t CMemoryReadWriteFile::write(const void* buffer, size_t sizeToWrite)
 
 	// expand size
 	if (Pos + sizeToWrite > Data.size())
-		Data.set_used(Pos+sizeToWrite);
+		Data.set_used((u32)(Pos+sizeToWrite));
 
 	// copy data
 	memcpy( (void*) &Data[Pos], buffer, sizeToWrite);
 
-	Pos += sizeToWrite;
+	Pos += (long)sizeToWrite;
 
 	return sizeToWrite;
 
@@ -46,7 +46,7 @@ bool CMemoryReadWriteFile::seek(long finalPos, bool relativeMovement)
 		Pos = finalPos;
 	}
 
-	if (Pos > (s32)Data.size())
+	if (Pos > (long)Data.size())
 		Data.set_used(Pos+1);
 
 	return true;