diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-07-28 18:41:49 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:09:33 +0300 |
commit | 1be68b2b557b6cd145fc1372f63f7fd8460534df (patch) | |
tree | 8674ce66af077d703cb77bf388dcf4112ccde313 /drape/stipple_pen_resource.cpp | |
parent | be3b4d884d8691a93edb0e8aed74fd012c803630 (diff) |
Moved line shape building to Read MWM task
Diffstat (limited to 'drape/stipple_pen_resource.cpp')
-rw-r--r-- | drape/stipple_pen_resource.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drape/stipple_pen_resource.cpp b/drape/stipple_pen_resource.cpp index 119f3d68cd..e571c4ac11 100644 --- a/drape/stipple_pen_resource.cpp +++ b/drape/stipple_pen_resource.cpp @@ -140,6 +140,8 @@ void StipplePenRasterizator::Rasterize(void * buffer) ref_ptr<Texture::ResourceInfo> StipplePenIndex::MapResource(StipplePenKey const & key, bool & newResource) { + lock_guard<mutex> g(m_mappingLock); + newResource = false; StipplePenHandle handle(key); TResourceMapping::iterator it = m_resourceMapping.find(handle); @@ -151,7 +153,7 @@ ref_ptr<Texture::ResourceInfo> StipplePenIndex::MapResource(StipplePenKey const StipplePenRasterizator resource(key); m2::RectU pixelRect = m_packer.PackResource(resource.GetSize()); { - threads::MutexGuard g(m_lock); + lock_guard<mutex> g(m_lock); m_pendingNodes.push_back(make_pair(pixelRect, resource)); } @@ -170,7 +172,7 @@ void StipplePenIndex::UploadResources(ref_ptr<Texture> texture) TPendingNodes pendingNodes; { - threads::MutexGuard g(m_lock); + lock_guard<mutex> g(m_lock); m_pendingNodes.swap(pendingNodes); } |