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

Compile issues for 64bits int under i386

Browse Source
This commit is contained in:
brunoherbelin
2020-10-08 20:26:17 +02:00
parent 67463d2214
commit 99f5236959
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
GlmToolkit.cpp
View File

@@ -8,10 +8,13 @@
#include <chrono> #include <chrono>
#include <ctime> #include <ctime>
uint64_t GlmToolkit::uniqueId() uint64_t GlmToolkit::uniqueId()
{ {
auto duration = std::chrono::high_resolution_clock::now().time_since_epoch(); // 18446744073709551615 auto duration = std::chrono::high_resolution_clock::now().time_since_epoch();
return std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count() % 1000000000000000000LL; // 64-bit int 18446744073709551615UL
return std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count() % 1000000000000000000UL;
} }
glm::mat4 GlmToolkit::transform(glm::vec3 translation, glm::vec3 rotation, glm::vec3 scale) glm::mat4 GlmToolkit::transform(glm::vec3 translation, glm::vec3 rotation, glm::vec3 scale)

6
ImGuiToolkit.cpp
View File

@@ -13,9 +13,9 @@
#endif #endif
#include "imgui_internal.h" #include "imgui_internal.h"
#define MILISECOND 1000000L #define MILISECOND 1000000UL
#define SECOND 1000000000L #define SECOND 1000000000UL
#define MINUTE 60000000000L #define MINUTE 60000000000UL
#include "Resource.h" #include "Resource.h"
#include "FileDialog.h" #include "FileDialog.h"

8
tinyxml2Toolkit.cpp
View File

@@ -123,12 +123,12 @@ XMLElement *tinyxml2::XMLElementEncodeArray(XMLDocument *doc, void *array, unsig
newelement->SetAttribute("zbytes", (uint) 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, (gsize) compressed_size);
} }
// failed compression // failed compression
else { else {
// encode the raw array // encode the raw array
encoded_array = g_base64_encode( (guchar *) array, (uLong) arraysize); encoded_array = g_base64_encode( (guchar *) array, (gsize) arraysize);
} }
// save the encoded string as text // save the encoded string as text
@@ -156,7 +156,7 @@ bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int
return ret; return ret;
// read and decode the text field in <array> // read and decode the text field in <array>
uLong decoded_size = 0; gsize decoded_size = 0;
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)
@@ -164,7 +164,7 @@ bool tinyxml2::XMLElementDecodeArray(XMLElement *elem, void *array, unsigned int
elem->QueryUnsignedAttribute("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 == (uint) decoded_size ) {
// allocate a temporary array for decompressing data // allocate a temporary array for decompressing data
uLong uncompressed_size = arraysize; uLong uncompressed_size = arraysize;