mirror of
https://github.com/minetest/irrlicht.git
synced 2024-12-25 02:00:30 +01:00
undo remove warnings
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6377 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
cf12a37521
commit
f0efd5857d
@ -646,7 +646,7 @@ private:
|
|||||||
\param sizeWithoutHeader: Text size in characters without header
|
\param sizeWithoutHeader: Text size in characters without header
|
||||||
*/
|
*/
|
||||||
template<class src_char_type>
|
template<class src_char_type>
|
||||||
void convertTextData(src_char_type* source, char* pointerToStore, long sizeWithoutHeader)
|
void convertTextData(src_char_type* source, char* pointerToStore, int sizeWithoutHeader)
|
||||||
{
|
{
|
||||||
// convert little to big endian if necessary
|
// convert little to big endian if necessary
|
||||||
if (sizeof(src_char_type) > 1 &&
|
if (sizeof(src_char_type) > 1 &&
|
||||||
|
@ -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.
|
// 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.
|
// So the correct solution is probably using fixed block here and always write when that is full.
|
||||||
core::stringw s;
|
core::stringw s;
|
||||||
s.reserve((u32)wcslen(text)+1);
|
s.reserve(wcslen(text)+1);
|
||||||
const wchar_t* p = text;
|
const wchar_t* p = text;
|
||||||
|
|
||||||
while(*p)
|
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.
|
// 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.
|
// So the correct solution is probably using fixed block here and always write when that is full.
|
||||||
core::stringc s;
|
core::stringc s;
|
||||||
s.reserve((u32)strlen(text)+1);
|
s.reserve(strlen(text)+1);
|
||||||
const c8* p = text;
|
const c8* p = text;
|
||||||
|
|
||||||
while(*p)
|
while(*p)
|
||||||
|
@ -809,7 +809,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
|
|||||||
pcData+4, propSize,
|
pcData+4, propSize,
|
||||||
e.header.GeneralBitFlag&0x1?LZMA_FINISH_END:LZMA_FINISH_ANY, &status,
|
e.header.GeneralBitFlag&0x1?LZMA_FINISH_END:LZMA_FINISH_ANY, &status,
|
||||||
&lzmaAlloc);
|
&lzmaAlloc);
|
||||||
uncompressedSize = (u32)tmpDstSize; // may be different to expected value
|
uncompressedSize = tmpDstSize; // may be different to expected value
|
||||||
|
|
||||||
if (decrypted)
|
if (decrypted)
|
||||||
decrypted->drop();
|
decrypted->drop();
|
||||||
|
@ -182,7 +182,7 @@ term_mem_destination (j_compress_ptr cinfo)
|
|||||||
my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
|
my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
|
||||||
|
|
||||||
*dest->outbuffer = dest->buffer;
|
*dest->outbuffer = dest->buffer;
|
||||||
*dest->outsize = (unsigned long)(dest->bufsize - dest->pub.free_in_buffer);
|
*dest->outsize = dest->bufsize - dest->pub.free_in_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ typedef struct {
|
|||||||
jvirt_barray_ptr virt_barray_list;
|
jvirt_barray_ptr virt_barray_list;
|
||||||
|
|
||||||
/* This counts total space obtained from jpeg_get_small/large */
|
/* This counts total space obtained from jpeg_get_small/large */
|
||||||
size_t total_space_allocated;
|
long total_space_allocated;
|
||||||
|
|
||||||
/* alloc_sarray and alloc_barray set this value for use by virtual
|
/* alloc_sarray and alloc_barray set this value for use by virtual
|
||||||
* array routines.
|
* array routines.
|
||||||
@ -618,7 +618,7 @@ realize_virt_arrays (j_common_ptr cinfo)
|
|||||||
|
|
||||||
/* Determine amount of memory to actually use; this is system-dependent. */
|
/* Determine amount of memory to actually use; this is system-dependent. */
|
||||||
avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
|
avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
|
||||||
(long)mem->total_space_allocated);
|
mem->total_space_allocated);
|
||||||
|
|
||||||
/* If the maximum space needed is available, make all the buffers full
|
/* If the maximum space needed is available, make all the buffers full
|
||||||
* height; otherwise parcel it out with the same number of minheights
|
* height; otherwise parcel it out with the same number of minheights
|
||||||
|
Loading…
Reference in New Issue
Block a user