Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-07-27 17:34:22 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-07-27 19:02:21 +0300
commit468f6a563bff0904f96a1399d1ed59a32a14e3e3 (patch)
treeade88237d429d0c1d58cee3cbc949a415c378749 /indexer/altitude_loader.cpp
parent3b8b50a68cead752c2cd858f3840b0d8a17217a9 (diff)
Reveiw fixes.
Diffstat (limited to 'indexer/altitude_loader.cpp')
-rw-r--r--indexer/altitude_loader.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indexer/altitude_loader.cpp b/indexer/altitude_loader.cpp
index 4041e23831..f253056543 100644
--- a/indexer/altitude_loader.cpp
+++ b/indexer/altitude_loader.cpp
@@ -87,10 +87,11 @@ TAltitudes const & AltitudeLoader::GetAltitudes(uint32_t featureId, size_t point
Altitudes altitudes;
ReaderSource<FilesContainerR::TReader> src(*m_reader);
src.Skip(altitudeInfoOffsetInSection);
- altitudes.Deserialize(m_header.m_minAltitude, pointCount, src);
+ bool const isDeserialized = altitudes.Deserialize(m_header.m_minAltitude, pointCount, src);
- bool const allValid = none_of(altitudes.m_altitudes.begin(), altitudes.m_altitudes.end(),
- [](TAltitude a) { return a == kInvalidAltitude; });
+ bool const allValid = isDeserialized
+ && none_of(altitudes.m_altitudes.begin(), altitudes.m_altitudes.end(),
+ [](TAltitude a) { return a == kInvalidAltitude; });
if (!allValid)
{
ASSERT(false, (altitudes.m_altitudes));