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

Crash on text texture overflow.

Browse source
This commit is contained in:
rachytski 2011-01-26 02:00:21 +02:00 • committed by Alex Zolotarev
parent b7c66335bb
commit db268385ee
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
yg/skin.cpp
View file

@ -46,7 +46,7 @@ namespace yg
{
uint8_t pageID = (uint8_t)m_pages.size();
m_pages.push_back(make_shared_ptr(new SkinPage(m_resourceManager, pageID)));
m_pages.back()->addOverflowFn(bind(&Skin::changeCurrentTextPage, this), 0);
m_pages.back()->addOverflowFn(bind(&Skin::onTextOverflow, this, pageID), 0);
}
}
@ -60,7 +60,7 @@ namespace yg
{
uint8_t pageID = (uint8_t)m_pages.size();
m_pages.push_back(make_shared_ptr(new SkinPage(m_resourceManager, pageID)));
m_pages.back()->addOverflowFn(bind(&Skin::changeCurrentDynamicPage, this), 0);
m_pages.back()->addOverflowFn(bind(&Skin::onDynamicOverflow, this, pageID), 0);
}
}
@ -194,12 +194,17 @@ namespace yg
/// Called from the skin page on handles overflow.
/// Never called on texture overflow, as this situation
/// are explicitly checked in the mapXXX() functions.
/* void Skin::onOverflow(uint8_t pageID)
void Skin::onDynamicOverflow(uint8_t pageID)
{
LOG(LINFO, ("Called from SkinPage as a reaction on handles overflow for pageID=", (uint32_t)pageID));
LOG(LINFO, ("DynamicPage switching, pageID=", (uint32_t)pageID));
changeCurrentDynamicPage();
}
*/
void Skin::onTextOverflow(uint8_t pageID)
{
LOG(LINFO, ("TextPage switching, pageID=", (uint32_t)pageID));
changeCurrentTextPage();
}
void Skin::changeCurrentDynamicPage()
{

3
yg/skin.hpp
View file

@ -93,7 +93,8 @@ namespace yg
void callOverflowFns(uint8_t pageID);
void clearPageHandles(uint8_t pageID);
// void onOverflow(uint8_t pageID);
void onDynamicOverflow(uint8_t pageID);
void onTextOverflow(uint8_t pageID);
void changeCurrentDynamicPage();
void changeCurrentTextPage();