diff options
author | Alex Zolotarev <alex@mapswithme.com> | 2013-06-16 02:45:16 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:56:43 +0300 |
commit | 4def3eec48be75335221b893031fae3964bde9da (patch) | |
tree | d854b3a98b6c214d197c805958eaca62ffbc039c /map | |
parent | 9fe15b5a58efc32fa19f940ac3ca93a94703cb31 (diff) |
Added zipped file size to ZipFileReader::FilesList()
Diffstat (limited to 'map')
-rw-r--r-- | map/framework.cpp | 8 | ||||
-rw-r--r-- | map/map_tests/kmz_unarchive_test.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index e5d1255830..0bb715380f 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -545,14 +545,14 @@ bool Framework::AddBookmarksFile(string const & filePath) { try { - vector<string> files; + ZipFileReader::FileListT files; ZipFileReader::FilesList(filePath, files); string kmlFileName; - for (size_t i = 0; i < files.size();++i) + for (size_t i = 0; i < files.size(); ++i) { - if (GetFileExt(files[i]) == BOOKMARKS_FILE_EXTENSION) + if (GetFileExt(files[i].first) == BOOKMARKS_FILE_EXTENSION) { - kmlFileName = files[i]; + kmlFileName = files[i].first; break; } } diff --git a/map/map_tests/kmz_unarchive_test.cpp b/map/map_tests/kmz_unarchive_test.cpp index 8d197a04b5..0446053d08 100644 --- a/map/map_tests/kmz_unarchive_test.cpp +++ b/map/map_tests/kmz_unarchive_test.cpp @@ -12,14 +12,14 @@ UNIT_TEST(Open_KMZ_Test) { string const KMZFILE = GetPlatform().WritablePathForFile("test.kmz"); - vector<string> files; + ZipFileReader::FileListT files; ZipFileReader::FilesList(KMZFILE, files); bool isKMLinZip = false; for (int i = 0; i < files.size();++i) { - if (files[i] == "doc.kml") + if (files[i].first == "doc.kml") { isKMLinZip = true; break; |