diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-28 15:40:06 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 19:27:32 +0200 |
| commit | 8dcc15538ec0a60b181ff8ecf386abe678eee03c (patch) | |
| tree | 820dd8eb08785fb0bcdb8973b30949d159a572f1 /external | |
| parent | 630574d66a67b08ebae808fc6fbe346c14e2493f (diff) | |
Patching libgltf: fix wrong deallocation method
Change-Id: I05c5650c1e43cf9ac4156e8d74073bf92ac0c4df
(cherry picked from commit 3ce0f83cec6d2ee1467523209df633c5a2487f71)
(cherry picked from commit 00e7b772b418049b117c57f8a3d85567701b47a6)
Diffstat (limited to 'external')
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | external/libgltf/patches/deallocation_fix.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index ce5ad79141a7..32377075c2a1 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/include_path_freetype.patch \ external/libgltf/patches/openmp-disable.patch \ external/libgltf/patches/rgba_textures.patch \ + external/libgltf/patches/deallocation_fix.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/deallocation_fix.patch b/external/libgltf/patches/deallocation_fix.patch new file mode 100644 index 000000000000..4049e2faf16f --- /dev/null +++ b/external/libgltf/patches/deallocation_fix.patch @@ -0,0 +1,12 @@ +diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp +--- libgltf.org/src/LoadScene.cpp 2014-05-28 15:35:48.232375923 +0200 ++++ libgltf/src/LoadScene.cpp 2014-05-28 15:36:02.600375314 +0200 +@@ -144,7 +144,7 @@ + free(gHandle->files);
+ gHandle->files = NULL;
+ }
+- delete gHandle;
++ free(gHandle);
+ return true;
+ }
+
|