add possibility to disable debug output

[enigma2.git] / lib / gdi / font.h

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index dbecd493ca0a6151eda5d5c4ebf1eb0bce482b98..41d51ddc0ec2df9b273cb326f701af01132a47c4 100644 (file)
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -8,6 +8,11 @@
 #include FT_CACHE_H
 #include FT_CACHE_IMAGE_H
 #include FT_CACHE_SMALL_BITMAPS_H
+#ifdef HAVE_FREETYPE2
+typedef FTC_ImageCache FTC_Image_Cache;
+typedef FTC_ImageTypeRec FTC_Image_Desc;
+typedef FTC_SBitCache FTC_SBit_Cache;
+#endif
 #include <vector>
 
 #include <lib/gdi/fb.h>
@@ -95,9 +100,8 @@ class eLCD;
 
 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;
@@ -178,8 +182,11 @@ public:
 
 class Font: public iObject
 {
-DECLARE_REF(Font);
+       DECLARE_REF(Font);
 public:
+#ifdef HAVE_FREETYPE2
+       FTC_ScalerRec scaler;
+#endif
        FTC_Image_Desc font;
        fontRenderClass *renderer;
        FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit);