X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fgdi%2Ffont.h;h=6b8218385388b47e24b997d4585346213dd090df;hb=fd0ee85977125975fa45da6fce3f841844d2b9c3;hp=7dd9f89a400c22ac3616f586fab5746eb3bb4768;hpb=e246e0ded446974b388f1e819bdbdb446ae4429f;p=vuplus_dvbapp diff --git a/lib/gdi/font.h b/lib/gdi/font.h index 7dd9f89..6b82183 100644 --- a/lib/gdi/font.h +++ b/lib/gdi/font.h @@ -8,11 +8,9 @@ #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 #include @@ -191,9 +189,7 @@ class Font: public iObject { 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);