From e9ecd6f8a7bce581655d88fe331ed7fc65af310e Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 17 Aug 2016 17:35:16 -0700 Subject: [PATCH 1/2] Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: --- code/glTFAssetWriter.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/glTFAssetWriter.inl b/code/glTFAssetWriter.inl index 0fa8556c0..f14afc4d8 100644 --- a/code/glTFAssetWriter.inl +++ b/code/glTFAssetWriter.inl @@ -105,7 +105,7 @@ namespace glTF { type = "arraybuffer"; } - obj.AddMember("byteLength", b.byteLength, w.mAl); + obj.AddMember("byteLength", (uint64_t)b.byteLength, w.mAl); obj.AddMember("type", StringRef(type), w.mAl); obj.AddMember("uri", Value(dataURI, w.mAl).Move(), w.mAl); } @@ -113,8 +113,8 @@ namespace glTF { inline void Write(Value& obj, BufferView& bv, AssetWriter& w) { obj.AddMember("buffer", Value(bv.buffer->id, w.mAl).Move(), w.mAl); - obj.AddMember("byteOffset", bv.byteOffset, w.mAl); - obj.AddMember("byteLength", bv.byteLength, w.mAl); + obj.AddMember("byteOffset", (uint64_t)bv.byteOffset, w.mAl); + obj.AddMember("byteLength", (uint64_t)bv.byteLength, w.mAl); obj.AddMember("target", int(bv.target), w.mAl); } From 666d1ce164323367a0bff8b34cfa71a723989a22 Mon Sep 17 00:00:00 2001 From: James Walker Date: Thu, 18 Aug 2016 10:55:24 -0700 Subject: [PATCH 2/2] Changed C-style casts to static_cast. --- code/glTFAssetWriter.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/glTFAssetWriter.inl b/code/glTFAssetWriter.inl index f14afc4d8..415db6714 100644 --- a/code/glTFAssetWriter.inl +++ b/code/glTFAssetWriter.inl @@ -105,7 +105,7 @@ namespace glTF { type = "arraybuffer"; } - obj.AddMember("byteLength", (uint64_t)b.byteLength, w.mAl); + obj.AddMember("byteLength", static_cast(b.byteLength), w.mAl); obj.AddMember("type", StringRef(type), w.mAl); obj.AddMember("uri", Value(dataURI, w.mAl).Move(), w.mAl); } @@ -113,8 +113,8 @@ namespace glTF { inline void Write(Value& obj, BufferView& bv, AssetWriter& w) { obj.AddMember("buffer", Value(bv.buffer->id, w.mAl).Move(), w.mAl); - obj.AddMember("byteOffset", (uint64_t)bv.byteOffset, w.mAl); - obj.AddMember("byteLength", (uint64_t)bv.byteLength, w.mAl); + obj.AddMember("byteOffset", static_cast(bv.byteOffset), w.mAl); + obj.AddMember("byteLength", static_cast(bv.byteLength), w.mAl); obj.AddMember("target", int(bv.target), w.mAl); }