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

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2018-06-14 12:45:54 +03:00 • committed by Arsentiy Milchakov
parent 9e3002d466
commit 84110327bd
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
coding/zip_reader.cpp
View file

@ -42,8 +42,7 @@ private:
ZipFileReader::ZipFileReader(string const & container, string const & file, uint32_t logPageSize,
uint32_t logPageCount)
: FileReader(container, true /* withExceptions */, logPageSize, logPageCount)
, m_uncompressedFileSize(0)
: FileReader(container, logPageSize, logPageCount), m_uncompressedFileSize(0)
{
unzFile zip = unzOpen64(container.c_str());
if (!zip)

1
platform/chunks_download_strategy.cpp
View file

@ -121,7 +121,6 @@ int64_t ChunksDownloadStrategy::LoadOrInitChunks(string const & fName, int64_t f
}
catch (FileReader::Exception const & e)
{
// Usually - file not exists or Reader::Exception.
LOG(LDEBUG, (e.Msg()));
}

6
platform/platform_android.cpp
View file

@ -151,7 +151,7 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string const &
{
string const path = m_writableDir + file;
if (IsFileExistsByFullPath(path))
return make_unique<FileReader>(path, true /* withExceptions */, logPageSize, logPageCount);
return make_unique<FileReader>(path, logPageSize, logPageCount);
break;
}
@ -159,13 +159,13 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string const &
{
string const path = m_settingsDir + file;
if (IsFileExistsByFullPath(path))
return make_unique<FileReader>(path, true /* withExceptions */, logPageSize, logPageCount);
return make_unique<FileReader>(path, logPageSize, logPageCount);
break;
}
case FULL_PATH:
if (IsFileExistsByFullPath(file))
return make_unique<FileReader>(file, true /* withExceptions */, logPageSize, logPageCount);
return make_unique<FileReader>(file, logPageSize, logPageCount);
break;
case RESOURCE:

4
platform/platform_ios.mm
View file

@ -115,8 +115,8 @@ bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
unique_ptr<ModelReader> Platform::GetReader(string const & file, string const & searchScope) const
{
return make_unique<FileReader>(ReadPathForFile(file, searchScope), true /* withExceptions */,
READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
return make_unique<FileReader>(ReadPathForFile(file, searchScope), READER_CHUNK_LOG_SIZE,
READER_CHUNK_LOG_COUNT);
}
int Platform::VideoMemoryLimit() const { return 8 * 1024 * 1024; }

4
platform/platform_tizen.cpp
View file

@ -73,9 +73,7 @@ void Platform::RunOnGuiThread(TFunctor const & fn)
ModelReader * Platform::GetReader(string const & file, string const & searchScope) const
{
return new FileReader(ReadPathForFile(file, searchScope),
true /* withExceptions */
READER_CHUNK_LOG_SIZE,
return new FileReader(ReadPathForFile(file, searchScope), READER_CHUNK_LOG_SIZE,
READER_CHUNK_LOG_COUNT);
}