X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fgltf2-loader.cpp;h=69bcd515f2e58a2ddee693437a90f273295149c9;hb=3da64a8d34ca7d92e78f018b583b8a15a52816bf;hp=1c633c860489037a3993517619d5f8fd0236e0f6;hpb=06cd3bf8b892c26f369aae331b16fba1547ed823;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-scene3d/public-api/loader/gltf2-loader.cpp b/dali-scene3d/public-api/loader/gltf2-loader.cpp
index 1c633c8..69bcd51 100644
--- a/dali-scene3d/public-api/loader/gltf2-loader.cpp
+++ b/dali-scene3d/public-api/loader/gltf2-loader.cpp
@@ -19,10 +19,10 @@
 #include <dali-scene3d/public-api/loader/gltf2-loader.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/threading/mutex.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/math/quaternion.h>
-#include <dali/devel-api/threading/mutex.h>
 #include <memory>
 
 // INTERNAL INCLUDES
@@ -467,7 +467,7 @@ SamplerFlags::Type ConvertSampler(const gt::Ref<gt::Sampler>& sampler)
 TextureDefinition ConvertTextureInfo(const gt::TextureInfo& mm, ConversionContext& context, const ImageMetadata& metaData = ImageMetadata())
 {
   TextureDefinition textureDefinition;
-  std::string uri = std::string(mm.mTexture->mSource->mUri);
+  std::string       uri = std::string(mm.mTexture->mSource->mUri);
   if(uri.empty())
   {
     uint32_t bufferIndex = mm.mTexture->mSource->mBufferView->mBuffer.GetIndex();
@@ -478,7 +478,7 @@ TextureDefinition ConvertTextureInfo(const gt::TextureInfo& mm, ConversionContex
       stream.seekg(mm.mTexture->mSource->mBufferView->mByteOffset, stream.beg);
       std::vector<uint8_t> dataBuffer;
       dataBuffer.resize(mm.mTexture->mSource->mBufferView->mByteLength);
-      stream.read(reinterpret_cast<char*>(dataBuffer.data()), mm.mTexture->mSource->mBufferView->mByteLength);
+      stream.read(reinterpret_cast<char*>(dataBuffer.data()), static_cast<std::streamsize>(static_cast<size_t>(mm.mTexture->mSource->mBufferView->mByteLength)));
       return TextureDefinition{std::move(dataBuffer), ConvertSampler(mm.mTexture->mSampler), metaData.mMinSize, metaData.mSamplingMode};
     }
     return TextureDefinition();
@@ -669,7 +669,7 @@ MeshDefinition::Accessor ConvertMeshPrimitiveAccessor(const gt::Accessor& acc)
                                    acc.mMin,
                                    acc.mMax}),
     std::move(sparseBlob),
-    acc.mBufferView->mBuffer.GetIndex()};
+    acc.mBufferView ? acc.mBufferView->mBuffer.GetIndex() : 0};
 }
 
 void ConvertMeshes(const gt::Document& doc, ConversionContext& context)
@@ -974,7 +974,7 @@ void LoadDataFromAccessor(ConversionContext& context, uint32_t bufferIndex, Vect
   auto& stream = buffer.GetBufferStream();
   stream.clear();
   stream.seekg(offset, stream.beg);
-  stream.read(reinterpret_cast<char*>(dataBuffer.Begin()), size);
+  stream.read(reinterpret_cast<char*>(dataBuffer.Begin()), static_cast<std::streamsize>(static_cast<size_t>(size)));
 }
 
 template<typename T>
@@ -1178,7 +1178,7 @@ void ProcessSkins(const gt::Document& doc, ConversionContext& context)
 
     virtual void Provide(Matrix& ibm) override
     {
-      DALI_ASSERT_ALWAYS(mStream.read(reinterpret_cast<char*>(ibm.AsFloat()), mElementSizeBytes));
+      DALI_ASSERT_ALWAYS(mStream.read(reinterpret_cast<char*>(ibm.AsFloat()), static_cast<std::streamsize>(static_cast<size_t>(mElementSizeBytes))));
     }
   };