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

fixed crash with long strings packing.

Browse source
This commit is contained in:
rachytski 2013-01-13 00:44:43 +03:00 • committed by Alex Zolotarev
parent 618355876a
commit d3d1741fec
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
graphics/text_element.cpp
View file

@ -119,10 +119,14 @@ namespace graphics
resInfos[i] = &glyphInfos[i];
}
if (firstVis != lastVis)
screen->mapInfo(&resInfos[firstVis],
&glyphIDs[firstVis],
lastVis - firstVis);
if ((firstVis != lastVis)
&& !screen->mapInfo(&resInfos[firstVis],
&glyphIDs[firstVis],
lastVis - firstVis))
{
LOG(LINFO, ("cannot render string", lastVis - firstVis, "characters long"));
return;
}
for (unsigned i = firstVis; i < lastVis; ++i)
{

10
map/tiling_render_policy_mt.cpp
View file

@ -23,6 +23,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
ResourceManager::TexturePoolParams tpp;
ResourceManager::StoragePoolParams spp;
int k = int(ceil(VisualScale()));
tpp = ResourceManager::TexturePoolParams(512,
512,
1,
@ -32,8 +34,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
rmp.m_textureParams[tpp.m_textureType] = tpp;
tpp = ResourceManager::TexturePoolParams(256,
256,
tpp = ResourceManager::TexturePoolParams(256 * k,
256 * k,
1,
rmp.m_texFormat,
EMediumTexture,
@ -50,8 +52,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
rmp.m_textureParams[tpp.m_textureType] = tpp;
tpp = ResourceManager::TexturePoolParams(128,
128,
tpp = ResourceManager::TexturePoolParams(128 * k,
128 * k,
4,
rmp.m_texFormat,
ESmallTexture,