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

Fixed compilation issue OSX

Browse Source
This commit is contained in:
brunoherbelin
2020-08-24 12:16:59 +02:00
parent 240f1fde0a
commit d49bea5723
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tinyxml2Toolkit.cpp
View File

@@ -85,7 +85,7 @@ void tinyxml2::XMLElementToGLM(XMLElement *elem, glm::mat4 &matrix)
}
XMLElement *tinyxml2::XMLElementEncodeArray(XMLDocument *doc, void *array, uint64_t arraysize)
XMLElement *tinyxml2::XMLElementEncodeArray(XMLDocument *doc, void *array, unsigned int arraysize)
{
gchar *encoded_string = g_base64_encode( (guchar *) array, arraysize);
@@ -99,18 +99,19 @@ XMLElement *tinyxml2::XMLElementEncodeArray(XMLDocument *doc, void *array, uint6
return newelement;
}
bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, uint64_t arraysize)
bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int arraysize)
{
if ( !elem || std::string(elem->Name()).find("array") == std::string::npos )
return false;
uint64_t len = 0;
elem->QueryUnsigned64Attribute("len", &len);
unsigned int len = 0;
elem->QueryUnsignedAttribute("len", &len);
if ( arraysize != len )
return false;
guchar *decoded_array = g_base64_decode(elem->GetText(), &len);
if ( arraysize != len )
gsize declen = 0;
guchar *decoded_array = g_base64_decode(elem->GetText(), &declen);
if ( arraysize != declen )
return false;
memcpy(array, decoded_array, len);

4
tinyxml2Toolkit.h
View File

@@ -17,8 +17,8 @@ void XMLElementToGLM(XMLElement *elem, glm::vec3 &vector);
void XMLElementToGLM(XMLElement *elem, glm::vec4 &vector);
void XMLElementToGLM(XMLElement *elem, glm::mat4 &matrix);
XMLElement *XMLElementEncodeArray(XMLDocument *doc, void *array, uint64_t arraysize);
bool XMLElementDecodeArray(XMLElement *elem, void *array, uint64_t arraysize);
XMLElement *XMLElementEncodeArray(XMLDocument *doc, void *array, unsigned int arraysize);
bool XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int arraysize);
bool XMLSaveDoc(tinyxml2::XMLDocument * const doc, std::string filename);
bool XMLResultError(int result);