Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_gltf2_export_componentType_error

Browse Source
This commit is contained in:
Kim Kulling
2018-05-09 11:22:09 +02:00
committed by GitHub
parent ea2c90ae79 24a5c123fe
commit 400b61b3fe
7 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/DXFLoader.cpp
View File

@@ -127,7 +127,7 @@ bool DXFImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool
if ( extension.empty() || checkSig ) {
static const char *pTokens[] = { "SECTION", "HEADER", "ENDSEC", "BLOCKS" };
return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, pTokens, 4 );
return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, pTokens, 4, 32 );
}
return false;

2
code/DefaultIOSystem.cpp
View File

@@ -80,7 +80,7 @@ bool DefaultIOSystem::Exists( const char* pFile) const
if (isUnicode) {
MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, pFile, -1, fileName16, PATHLIMIT);
struct _stat64 filestat;
struct __stat64 filestat;
if (0 != _wstat64(fileName16, &filestat)) {
return false;
}