diff options
author | vng <viktor.govako@gmail.com> | 2012-06-16 13:47:40 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:39:56 +0300 |
commit | 4bf13b09cd9ced3791aaaec5011d1128ef58a68d (patch) | |
tree | 5ffc1b988a2b0e7bb2622b3365b8f5eaf996cda1 /coding | |
parent | 17952944f298181a127792190b65fea43337e8de (diff) |
- Make unique constants for map reader for all the platforms.
- Reduse default constants for regular FileReader.
Diffstat (limited to 'coding')
-rw-r--r-- | coding/file_reader.hpp | 2 | ||||
-rw-r--r-- | coding/zip_reader.cpp | 3 | ||||
-rw-r--r-- | coding/zip_reader.hpp | 11 |
3 files changed, 5 insertions, 11 deletions
diff --git a/coding/file_reader.hpp b/coding/file_reader.hpp index 4e2370a8e5..76cfa881f8 100644 --- a/coding/file_reader.hpp +++ b/coding/file_reader.hpp @@ -13,7 +13,7 @@ class FileReader : public ModelReader public: explicit FileReader(string const & fileName, uint32_t logPageSize = 10, - uint32_t logPageCount = 8); + uint32_t logPageCount = 4); class FileReaderData; diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp index 4eed5c536f..cb123cac2a 100644 --- a/coding/zip_reader.cpp +++ b/coding/zip_reader.cpp @@ -9,8 +9,9 @@ #include "../3party/zlib/contrib/minizip/unzip.h" + ZipFileReader::ZipFileReader(string const & container, string const & file) - : BaseZipFileReaderType(container), m_uncompressedFileSize(0) + : FileReader(container), m_uncompressedFileSize(0) { unzFile zip = unzOpen64(container.c_str()); if (!zip) diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp index b00e7fcad0..088ee2651a 100644 --- a/coding/zip_reader.hpp +++ b/coding/zip_reader.hpp @@ -1,20 +1,13 @@ #pragma once -#include "../std/target_os.hpp" -//#ifdef OMIM_OS_WINDOWS - #include "file_reader.hpp" - typedef FileReader BaseZipFileReaderType; -//#else -// #include "mmap_reader.hpp" -// typedef MmapReader BaseZipFileReaderType; -//#endif +#include "file_reader.hpp" #include "../base/exception.hpp" #include "../std/function.hpp" -class ZipFileReader : public BaseZipFileReaderType +class ZipFileReader : public FileReader { private: uint64_t m_uncompressedFileSize; |