aboutsummaryrefslogtreecommitdiff
path: root/lib/gdi/font.cpp
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2004-09-25 16:13:48 +0000
committerFelix Domke <tmbinc@elitedvb.net>2004-09-25 16:13:48 +0000
commit1aeefd997cc362c3b37c1587c5f08891b35c3a75 (patch)
tree621600d89b20531ee9e6497dbc9fb50db8a4d759 /lib/gdi/font.cpp
parent636a782d8920b4b52a881a4565c46c06f68785b5 (diff)
downloadenigma2-1aeefd997cc362c3b37c1587c5f08891b35c3a75.tar.gz
enigma2-1aeefd997cc362c3b37c1587c5f08891b35c3a75.zip
- new GUI lib
- fixes
Diffstat (limited to 'lib/gdi/font.cpp')
-rw-r--r--lib/gdi/font.cpp28
1 files changed, 1 insertions, 27 deletions
diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 2f2823bb..a8f0b120 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -388,30 +388,10 @@ void eTextPara::newLine(int flags)
eTextPara::~eTextPara()
{
clear();
- if (refcnt>=0)
- eFatal("verdammt man der war noch gelockt :/\n");
-}
-
-void eTextPara::destroy()
-{
- singleLock s(refcntlck);
-
- if (!refcnt--)
- delete this;
-}
-
-eTextPara *eTextPara::grab()
-{
- singleLock s(refcntlck);
-
- refcnt++;
- return this;
}
void eTextPara::setFont(const gFont *font)
{
- if (refcnt)
- eFatal("mod. after lock");
ePtr<Font> fnt, replacement;
fontRenderClass::getInstance()->getFont(fnt, font->family.c_str(), font->pointSize);
if (!fnt)
@@ -424,8 +404,6 @@ eString eTextPara::replacement_facename;
void eTextPara::setFont(Font *fnt, Font *replacement)
{
- if (refcnt)
- eFatal("mod. after lock");
if (!fnt)
return;
current_font=fnt;
@@ -463,9 +441,6 @@ int eTextPara::renderString(const eString &string, int rflags)
{
singleLock s(ftlock);
- if (refcnt)
- eFatal("mod. after lock");
-
if (!current_font)
return -1;
@@ -689,8 +664,7 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
}
gRegion area(eRect(0, 0, surface->x, surface->y));
- gRegion clip;
- clip.intersect(area, dc.getClip());
+ gRegion clip = dc.getClip() & area;
int buffer_stride=surface->stride;