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

[drape] EndReadTile must be called anyway

Browse source
This commit is contained in:
ExMix 2014-02-06 13:36:34 +03:00 • committed by Alex Zolotarev
parent 3aaa6702ac
commit 2555c4b82e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/tile_info.cpp
View file

@ -3,6 +3,7 @@
#include "stylist.hpp"
#include "rule_drawer.hpp"
#include "../base/scope_guard.hpp"
#include "../map/feature_vec_model.hpp"
#include "../std/bind.hpp"
@ -62,12 +63,15 @@ namespace df
if (!indexes.empty())
{
context.BeginReadTile(m_key);
// Reading can be interrupted by exception throwing
MY_SCOPE_GUARD(ReleaseReadTile, bind(&EngineContext::EndReadTile, &context, m_key));
vector<FeatureID> featuresToRead;
for_each(indexes.begin(), indexes.end(), IDsAccumulator(featuresToRead, m_featureInfo));
RuleDrawer drawer(bind(&TileInfo::InitStylist, this, _1 ,_2), m_key, context);
model.ReadFeatures(drawer, featuresToRead);
context.EndReadTile(m_key);
}
}