projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
mesh-definition.cpp
diff --git
a/dali-scene3d/public-api/loader/mesh-definition.cpp
b/dali-scene3d/public-api/loader/mesh-definition.cpp
index
4fc60e4
..
6728790
100644
(file)
--- a/
dali-scene3d/public-api/loader/mesh-definition.cpp
+++ b/
dali-scene3d/public-api/loader/mesh-definition.cpp
@@
-101,7
+101,7
@@
const char* QUAD("quad");
bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint8_t* target)
{
source.clear();
bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint8_t* target)
{
source.clear();
- if(!source.seekg(
descriptor.mOffset
, std::istream::beg))
+ if(!source.seekg(
static_cast<std::streamoff>(static_cast<std::size_t>(descriptor.mOffset))
, std::istream::beg))
{
return false;
}
{
return false;
}
@@
-122,7
+122,7
@@
bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint
{
readSize += descriptor.mStride;
target += descriptor.mElementSizeHint;
{
readSize += descriptor.mStride;
target += descriptor.mElementSizeHint;
- source.seekg(
diff
, std::istream::cur);
+ source.seekg(
static_cast<std::streamoff>(static_cast<std::size_t>(diff))
, std::istream::cur);
}
return readSize == totalSize;
}
}
return readSize == totalSize;
}