git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
gdi
/
font.h
diff --git
a/lib/gdi/font.h
b/lib/gdi/font.h
index 3cdfc299c0d64f6b853970e6c235bbd3f4e0669e..41d51ddc0ec2df9b273cb326f701af01132a47c4 100644
(file)
--- a/
lib/gdi/font.h
+++ b/
lib/gdi/font.h
@@
-100,9
+100,8
@@
class eLCD;
class eTextPara: public iObject
{
class eTextPara: public iObject
{
-DECLARE_REF(eTextPara);
-private:
- ePtr<Font> current_font, replacement_font;
+ DECLARE_REF(eTextPara);
+ ePtr<Font> current_font, replacement_font;
FT_Face current_face, replacement_face;
int use_kerning;
int previous;
FT_Face current_face, replacement_face;
int use_kerning;
int previous;
@@
-183,7
+182,7
@@
public:
class Font: public iObject
{
class Font: public iObject
{
-DECLARE_REF(Font);
+
DECLARE_REF(Font);
public:
#ifdef HAVE_FREETYPE2
FTC_ScalerRec scaler;
public:
#ifdef HAVE_FREETYPE2
FTC_ScalerRec scaler;