Kaydet (Commit) 9cf12d75 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Patching libgltf: character buffer is used as cstring

Change-Id: If0213fc5406ec9cbdc72be36ffc693fcbbf8ffcc
üst aee75b57
...@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ ...@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_typo_texture.patch \ external/libgltf/patches/include_typo_texture.patch \
external/libgltf/patches/adress_of_temporary.patch \ external/libgltf/patches/adress_of_temporary.patch \
external/libgltf/patches/avoid_c++11.patch \ external/libgltf/patches/avoid_c++11.patch \
external/libgltf/patches/charbuffer_used_as_cstring.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
--- libgltf.org/src/RenderScene.cpp 2014-04-18 13:52:31.148772285 +0200
+++ libgltf/src/RenderScene.cpp 2014-04-18 15:08:15.001604707 +0200
@@ -211,7 +211,7 @@
{
if(0 == jsonfile)
return 0;
- string tmpStr(jsonfile->buffer);
+ string tmpStr(jsonfile->buffer,jsonfile->size);
loadJson.setJsonInfo(tmpStr);
if (!loadJson.parseJsonFile())
return 0;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment