diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-04-23 13:24:13 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-04-23 13:24:13 +0200 |
| commit | e21cff679bb73bce310e877d5219ec29291dbe10 (patch) | |
| tree | ca5ef1a2c77b6b588ebff4bb479f3485dd44529c /lib/gdi/font.cpp | |
| parent | 6ae5d719b93de2e8897a660ac61b0e9c5a190dde (diff) | |
| parent | 4b7061b946278825a03d7dd07a65056c3f4e1373 (diff) | |
| download | enigma2-e21cff679bb73bce310e877d5219ec29291dbe10.tar.gz enigma2-e21cff679bb73bce310e877d5219ec29291dbe10.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/gdi/font.cpp')
| -rw-r--r-- | lib/gdi/font.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index 6a6007ee..dfac144c 100644 --- 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_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, @@ -544,7 +533,18 @@ int eTextPara::renderString(const char *string, int rflags) 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)); |