projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
efd8612
)
Fix delete / delete[] mismatches in glTF2 importer
author
Turo Lamminen
<turotl@gmail.com>
Thu, 14 Sep 2017 07:34:16 +0000
(10:34 +0300)
committer
Turo Lamminen
<turotl@gmail.com>
Mon, 2 Oct 2017 07:55:26 +0000
(10:55 +0300)
code/glTF2Asset.inl
patch
|
blob
|
history
diff --git
a/code/glTF2Asset.inl
b/code/glTF2Asset.inl
index
264a32d
..
ac0f353
100644
(file)
--- a/
code/glTF2Asset.inl
+++ b/
code/glTF2Asset.inl
@@
-357,7
+357,7
@@
inline bool Buffer::LoadFromStream(IOStream& stream, size_t length, size_t baseO
stream.Seek(baseOffset, aiOrigin_SET);
}
- mData.reset(new uint8_t[byteLength]);
+ mData.reset(new uint8_t[byteLength]
, std::default_delete<uint8_t[]>()
);
if (stream.Read(mData.get(), byteLength, 1) != 1) {
return false;
@@
-451,7
+451,7
@@
inline void Buffer::Grow(size_t amount)
if (amount <= 0) return;
uint8_t* b = new uint8_t[byteLength + amount];
if (mData) memcpy(b, mData.get(), byteLength);
- mData.reset(b);
+ mData.reset(b
, std::default_delete<uint8_t[]>()
);
byteLength += amount;
}