v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723

pull/732/head
Kim Kulling 2015-12-27 20:36:54 +01:00
parent 9409ce3b56
commit 22f7f60ba0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/ObjFileMtlImporter.cpp
View File

@ -378,11 +378,10 @@ void ObjFileMtlImporter::getTexture() {
* Because aiMaterial supports clamp option, so we also want to return it * Because aiMaterial supports clamp option, so we also want to return it
* ///////////////////////////////////////////////////////////////////////////// * /////////////////////////////////////////////////////////////////////////////
*/ */
void ObjFileMtlImporter::getTextureOption(bool &clamp, int &clampIndex, aiString *&out) void ObjFileMtlImporter::getTextureOption(bool &clamp, int &clampIndex, aiString *&out) {
{
m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd); m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd);
//If there is any more texture option // If there is any more texture option
while (!isEndOfBuffer(m_DataIt, m_DataItEnd) && *m_DataIt == '-') while (!isEndOfBuffer(m_DataIt, m_DataItEnd) && *m_DataIt == '-')
{ {
const char *pPtr( &(*m_DataIt) ); const char *pPtr( &(*m_DataIt) );

11
contrib/rapidjson/include/rapidjson/document.h
View File

@ -513,12 +513,19 @@ public:
flags_ |= kUintFlag | kUint64Flag; flags_ |= kUintFlag | kUint64Flag;
} }
//! Constructor for size_t value.
explicit GenericValue( size_t u ) RAPIDJSON_NOEXCEPT : data_(), flags_( kNumberUintFlag ) {
data_.n.u64 = u;
if ( !( u&0x80000000 ) )
flags_ |= kIntFlag|kInt64Flag;
}
//! Constructor for unsigned value. //! Constructor for unsigned value.
explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) { /* explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
data_.n.u64 = u; data_.n.u64 = u;
if (!(u & 0x80000000)) if (!(u & 0x80000000))
flags_ |= kIntFlag | kInt64Flag; flags_ |= kIntFlag | kInt64Flag;
} }*/
//! Constructor for int64_t value. //! Constructor for int64_t value.
explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) { explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) {