eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation issue (OSX)

Browse Source
This commit is contained in:
brunoherbelin
2020-10-07 12:07:03 +02:00
parent 977ae76f9b
commit 10dc426119
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tinyxml2Toolkit.cpp
View File

@@ -120,7 +120,7 @@ XMLElement *tinyxml2::XMLElementEncodeArray(XMLDocument *doc, void *array, unsig
(Bytef *)array, arraysize) ) { (Bytef *)array, arraysize) ) {
// compression suceeded : add a zbytes field to indicate how much data was compressed // compression suceeded : add a zbytes field to indicate how much data was compressed
newelement->SetAttribute("zbytes", (unsigned long) compressed_size); newelement->SetAttribute("zbytes", (uint) compressed_size);
// encode the compressed array // encode the compressed array
encoded_array = g_base64_encode( (guchar *) compressed_array, compressed_size); encoded_array = g_base64_encode( (guchar *) compressed_array, compressed_size);
@@ -160,8 +160,8 @@ bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int
guchar *decoded_array = g_base64_decode(elem->GetText(), &decoded_size); guchar *decoded_array = g_base64_decode(elem->GetText(), &decoded_size);
// if data is z-compressed (zbytes size is indicated) // if data is z-compressed (zbytes size is indicated)
uLong zbytes = 0; uint zbytes = 0;
elem->QueryUnsigned64Attribute("zbytes", &zbytes); elem->QueryUnsignedAttribute("zbytes", &zbytes);
if ( zbytes > 0) { if ( zbytes > 0) {
// sanity check 1: decoded data size must match the buffer size // sanity check 1: decoded data size must match the buffer size
if ( decoded_array && zbytes == decoded_size ) { if ( decoded_array && zbytes == decoded_size ) {
@@ -172,7 +172,7 @@ bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int
// zlib uncompress ((Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)); // zlib uncompress ((Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen));
uncompress((Bytef *)uncompressed_array, &uncompressed_size, uncompress((Bytef *)uncompressed_array, &uncompressed_size,
(Bytef *)decoded_array, zbytes) ; (Bytef *)decoded_array, (uLong) zbytes) ;
// sanity check 2: decompressed data size must match array size // sanity check 2: decompressed data size must match array size
if ( uncompressed_array && arraysize == uncompressed_size ){ if ( uncompressed_array && arraysize == uncompressed_size ){