File add-typecasts-in-glTFAssetWriter.inl.patch of Package libqt5-qt3d

Overview Repositories Revisions Requests Users Attributes Meta

File add-typecasts-in-glTFAssetWriter.inl.patch of Package libqt5-qt3d (Revision 2daa718eb45df06e21a83aa457b9475c)

Currently displaying revision 2daa718eb45df06e21a83aa457b9475c , Show latest

From e9ecd6f8a7bce581655d88fe331ed7fc65af310e Mon Sep 17 00:00:00 2001
From: James Walker <jamesw@frameforge3d.com>
Date: Wed, 17 Aug 2016 17:35:16 -0700
Subject: [PATCH] Add typecasts in glTFAssetWriter.inl to fix compile errors
 about ambiguous constructors, see:
 <https://github.com/assimp/assimp/issues/980>

This patch is merged e9ecd6f8 and 666d1ce1.

---
 src/3rdparty/assimp/code/glTFAssetWriter.inl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/assimp/code/glTFAssetWriter.inl b/src/3rdparty/assimp/code/glTFAssetWriter.inl
index 0fa8556c..f14afc4d 100644
--- a/src/3rdparty/assimp/code/glTFAssetWriter.inl
+++ b/src/3rdparty/assimp/code/glTFAssetWriter.inl
@@ -105,7 +105,7 @@ namespace glTF {
                 type = "arraybuffer";
         }
 
-        obj.AddMember("byteLength", b.byteLength, w.mAl);
+        obj.AddMember("byteLength", static_cast<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", static_cast<uint64_t>(bv.byteOffset), w.mAl);
+        obj.AddMember("byteLength", static_cast<uint64_t>(bv.byteLength), w.mAl);
         obj.AddMember("target", int(bv.target), w.mAl);
     }
 
-- 
2.16.1

Places

File add-typecasts-in-glTFAssetWriter.inl.patch of Package libqt5-qt3d (Revision 2daa718eb45df06e21a83aa457b9475c)

Places