From 0ef0c4276d0be6806087771fc692dc9a33d4830f Mon Sep 17 00:00:00 2001 From: Kearwood Kip Gilbert Date: Thu, 27 Jul 2017 23:37:32 -0700 Subject: [PATCH] Windows build errors and warning fixes --- kraken/KRContext.h | 2 +- kraken/KRMesh.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kraken/KRContext.h b/kraken/KRContext.h index 6603452..75c1e60 100755 --- a/kraken/KRContext.h +++ b/kraken/KRContext.h @@ -89,7 +89,7 @@ public: typedef void log_callback(void *userdata, const std::string &message, log_level level); static void SetLogCallback(log_callback *log_callback, void *user_data); - static void Log(log_level level, const std::string &message_format, ...); + static void Log(log_level level, const std::string message_format, ...); void doStreaming(); void receivedMemoryWarning(); diff --git a/kraken/KRMesh.cpp b/kraken/KRMesh.cpp index 4bf67c7..a87737f 100755 --- a/kraken/KRMesh.cpp +++ b/kraken/KRMesh.cpp @@ -1316,7 +1316,7 @@ void KRMesh::convertToIndexed() } if(submesh_index == 0 || vertex_index_offset + vertex_count > 0xffff) { - mi.vertex_index_bases.push_back(std::pair(mi.vertex_indexes.size(), mi.vertices.size())); + mi.vertex_index_bases.push_back(std::pair((int)mi.vertex_indexes.size(), (int)mi.vertices.size())); vertex_index_offset = 0; vertex_index_base_start_vertex = mi.vertices.size(); } @@ -1452,7 +1452,7 @@ void KRMesh::convertToIndexed() } if(vertex_index_offset + vertex_count > 0xffff) { - mi.vertex_index_bases.push_back(std::pair(mi.vertex_indexes.size(), mi.vertices.size())); + mi.vertex_index_bases.push_back(std::pair((int)mi.vertex_indexes.size(), (int)mi.vertices.size())); vertex_index_offset = 0; vertex_index_base_start_vertex = mi.vertices.size(); }