git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15a8fe8
)
font.cpp: fix
author
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 21 Apr 2009 08:31:03 +0000
(10:31 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 21 Apr 2009 08:31:03 +0000
(10:31 +0200)
lib/gdi/font.cpp
patch
|
blob
|
history
diff --git
a/lib/gdi/font.cpp
b/lib/gdi/font.cpp
index 6a6007eebfb35f923f8b20cf7a4bcac167d4cf10..dfac144c752d41c7506f59972fdb0a573a4ab6c4 100644
(file)
--- a/
lib/gdi/font.cpp
+++ b/
lib/gdi/font.cpp
@@
-511,17
+511,6
@@
int eTextPara::renderString(const char *string, int rflags)
if (!current_font)
return -1;
if (!current_font)
return -1;
- if (!current_face)
- eFatal("eTextPara::renderString: no current_face");
- if (!current_face->size)
- eFatal("eTextPara::renderString: no current_face->size");
-
- if (cursor.y()==-1)
- {
- cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
- left=cursor.x();
- }
-
#ifdef HAVE_FREETYPE2
if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
current_font->scaler.face_id,
#ifdef HAVE_FREETYPE2
if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
current_font->scaler.face_id,
@@
-544,7
+533,18
@@
int eTextPara::renderString(const char *string, int rflags)
cache_current_font=¤t_font->font.font;
}
#endif
cache_current_font=¤t_font->font.font;
}
#endif
-
+
+ if (!current_face)
+ eFatal("eTextPara::renderString: no current_face");
+ if (!current_face->size)
+ eFatal("eTextPara::renderString: no current_face->size");
+
+ if (cursor.y()==-1)
+ {
+ cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
+ left=cursor.x();
+ }
+
std::vector<unsigned long> uc_string, uc_visual;
if (string)
uc_string.reserve(strlen(string));
std::vector<unsigned long> uc_string, uc_visual;
if (string)
uc_string.reserve(strlen(string));