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

closes https://github.com/assimp/assimp/issues/901

Browse Source
This commit is contained in:
Kim Kulling
2016-08-12 17:13:18 +02:00
parent 8ba10cf26a
commit bdcff35d5d
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/DefaultIOStream.cpp
View File

@@ -55,6 +55,7 @@ DefaultIOStream::~DefaultIOStream()
{
if (mFile) {
::fclose(mFile);
mFile = nullptr;
}
}
@@ -111,7 +112,7 @@ size_t DefaultIOStream::FileSize() const
if (SIZE_MAX == cachedSize) {
// Although fseek/ftell would allow us to reuse the exising file handle here,
// Although fseek/ftell would allow us to reuse the existing file handle here,
// it is generally unsafe because:
// - For binary streams, it is not technically well-defined
// - For text files the results are meaningless
@@ -125,12 +126,14 @@ size_t DefaultIOStream::FileSize() const
if (0 != err)
return 0;
cachedSize = (size_t) (fileStat.st_size);
#else
#elif defined __gnu_linux__
struct stat fileStat;
int err = stat(mFilename.c_str(), &fileStat );
if (0 != err)
return 0;
cachedSize = (size_t) (fileStat.st_size);
#else
# error "Unknown platform"
#endif
}
return cachedSize;

8
code/DefaultIOStream.h
View File

@@ -59,11 +59,11 @@ class ASSIMP_API DefaultIOStream : public IOStream
{
friend class DefaultIOSystem;
#if __ANDROID__
#if __ANDROID_API__ > 9
#if defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT)
# if __ANDROID_API__ > 9
# if defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT)
friend class AndroidJNIIOSystem;
#endif // defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT)
#endif // __ANDROID_API__ > 9
# endif // defined(AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT)
# endif // __ANDROID_API__ > 9
#endif // __ANDROID__
protected: