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

review fixes

Browse source
This commit is contained in:
ExMix 2015-11-02 22:31:33 +03:00 • committed by r.kuznetsov
parent 2b97e95a86
commit e94ca14b92
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp
View file

@ -155,6 +155,7 @@ namespace
virtual void Do()
{
vector<FeatureID> result;
df::MemoryFeatureIndex::Lock lock(m_index);
m_index.ReadFeaturesRequest(m_features, result);
MarkNodesAsReaded(m_features, result);
}

4
drape_frontend/tile_info.cpp
View file

@ -57,13 +57,12 @@ void TileInfo::ReadFeatures(MapDataProvider const & model, MemoryFeatureIndex &
// Reading can be interrupted by exception throwing
MY_SCOPE_GUARD(ReleaseReadTile, bind(&EngineContext::EndReadTile, m_context.get()));
ReadFeatureIndex(model);
vector<FeatureID> featuresToRead;
{
MemoryFeatureIndex::Lock lock(memIndex);
UNUSED_VALUE(lock);
ReadFeatureIndex(model);
CheckCanceled();
featuresToRead.reserve(AverageFeaturesCount);
memIndex.ReadFeaturesRequest(m_featureInfo, featuresToRead);
@ -92,7 +91,6 @@ bool TileInfo::IsCancelled() const
void TileInfo::ProcessID(FeatureID const & id)
{
m_featureInfo.push_back(id);
CheckCanceled();
}
void TileInfo::InitStylist(FeatureType const & f, Stylist & s)