Update of /cvsroot/libufo/ufo-0.5/src/font
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31485/src/font
Modified Files:
ufont.cpp
Log Message:
Updated to new volatile data API.
Index: ufont.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/font/ufont.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ufont.cpp 12 Jul 2005 13:29:06 -0000 1.12
--- ufont.cpp 24 Oct 2005 15:58:43 -0000 1.13
***************
*** 242,248 ****
m_renderer = tk->createFontRenderer(info);
fontContextCache[m_renderer->getFontInfo()] = m_renderer;
- display->addVolatileData(m_renderer);
- //static int nfonts = 0;
- //std::cerr << "created " << ++nfonts << " fonts\n";
}
--- 242,245 ----
***************
*** 254,264 ****
UFont::dispose() {
// ref count == 1: we have to remove it from the cache
! if (UDisplay::getDefault() && m_renderer && m_renderer->getReferenceCount() == 1) {
! UDisplay * display = UDisplay::getDefault();
// FIXME: see above
//fontCache_t fontContextCache = sm_fontCache[display];
if (fontContextCache[m_renderer->getFontInfo()]) {
fontContextCache.erase(m_renderer->getFontInfo());
- display->removeVolatileData(m_renderer);
}
}
--- 251,259 ----
UFont::dispose() {
// ref count == 1: we have to remove it from the cache
! if (m_renderer && m_renderer->getReferenceCount() == 1) {
// FIXME: see above
//fontCache_t fontContextCache = sm_fontCache[display];
if (fontContextCache[m_renderer->getFontInfo()]) {
fontContextCache.erase(m_renderer->getFontInfo());
}
}
|
