git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix LCD in MoviePlayer
[enigma2.git]
/
lib
/
gdi
/
font.cpp
diff --git
a/lib/gdi/font.cpp
b/lib/gdi/font.cpp
index b2df471bbefa3f499e1860fde750a8dd9266e6e5..4c08b4fcf4e9742f13835888da2150482435d2cd 100644
(file)
--- a/
lib/gdi/font.cpp
+++ b/
lib/gdi/font.cpp
@@
-361,7
+361,7
@@
void eTextPara::calc_bbox()
boundBox = i->bbox;
++i;
boundBox = i->bbox;
++i;
- for (
i
; i != glyphs.end(); ++i)
+ for (; i != glyphs.end(); ++i)
{
if ( i->flags & GS_ISSPACE )
continue;
{
if ( i->flags & GS_ISSPACE )
continue;
@@
-406,6
+406,7
@@
void eTextPara::setFont(const gFont *font)
}
std::string eTextPara::replacement_facename;
}
std::string eTextPara::replacement_facename;
+std::set<int> eTextPara::forced_replaces;
void eTextPara::setFont(Font *fnt, Font *replacement)
{
void eTextPara::setFont(Font *fnt, Font *replacement)
{
@@
-587,9
+588,10
@@
nprint: isprintable=0;
}
if (isprintable)
{
}
if (isprintable)
{
- FT_UInt index;
-
- index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
+ FT_UInt index = 0;
+
+ if (forced_replaces.find(*i) == forced_replaces.end())
+ index=(rflags&RS_DIRECT)? *i : FT_Get_Char_Index(current_face, *i);
if (!index)
{
if (!index)
{