pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix compilation.

Browse source
This commit is contained in:
vng 2013-06-16 14:18:37 +02:00 • committed by Alex Zolotarev
parent 4def3eec48
commit 8dabfc9d1b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/platform_android.cpp
View file

@ -43,22 +43,24 @@ void Platform::GetFilesByRegExp(string const & directory, string const & regexp,
if (ZipFileReader::IsZip(directory))
{
// Get files list inside zip file
FilesList fList;
typedef ZipFileReader::FileListT FilesT;
FilesT fList;
ZipFileReader::FilesList(directory, fList);
regexp::RegExpT exp;
regexp::Create(regexp, exp);
for (FilesList::iterator it = fList.begin(); it != fList.end(); ++it)
for (FilesT::iterator it = fList.begin(); it != fList.end(); ++it)
{
if (regexp::IsExist(*it, exp))
string & name = it->first;
if (regexp::IsExist(name, exp))
{
// Remove assets/ prefix - clean files are needed for fonts white/blacklisting logic
size_t const ASSETS_LENGTH = 7;
if (it->find("assets/") == 0)
it->erase(0, ASSETS_LENGTH);
if (name.find("assets/") == 0)
name.erase(0, ASSETS_LENGTH);
res.push_back(*it);
res.push_back(name);
}
}
}