kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed recursion with GetReader

Browse source
This commit is contained in:
Alex Zolotarev 2011-10-10 19:36:06 +03:00 • committed by Alex Zolotarev
parent dfa35b34e0
commit 3a44c13501
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform/platform_android.cpp
View file

@ -5,6 +5,7 @@
#include <dirent.h>
#include <unistd.h>
#include <sys/stat.h>
static string ReadPathForFile(string const & writableDir,
string const & resourcesDir, string const & file)
@ -25,9 +26,16 @@ Platform::Platform()
Platform::~Platform()
{}
static bool IsFilePresent(string const & file)
{
struct stat s;
return stat(file.c_str(), &s) == 0;
}
ModelReader * Platform::GetReader(string const & file) const
{
if (IsFileExists(m_writableDir + file))
// can't use Platform::IsFileExists here to avoid recursion
if (IsFilePresent(m_writableDir + file))
return new FileReader(ReadPathForFile(m_writableDir, m_resourcesDir, file), 10, 12);
else
{ // paths from GetFilesInDir will already contain "assets/"
@ -125,7 +133,7 @@ bool Platform::GetFileSize(string const & file, uint64_t & size) const
size = ReaderPtr<Reader>(GetReader(file)).Size();
return true;
}
catch (RootException)
catch (RootException const &)
{
return false;
}