X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fce66e72c0ad6e000b22fdda7b57f3544763e1ca..f27bd5e1b2c49b0db87dbac70298ad33d2e4d537:/lib/gdi/font.h diff --git a/lib/gdi/font.h b/lib/gdi/font.h index 3cdfc299..2643fda2 100644 --- a/lib/gdi/font.h +++ b/lib/gdi/font.h @@ -100,9 +100,8 @@ class eLCD; class eTextPara: public iObject { -DECLARE_REF(eTextPara); -private: - ePtr current_font, replacement_font; + DECLARE_REF(eTextPara); + ePtr current_font, replacement_font; FT_Face current_face, replacement_face; int use_kerning; int previous; @@ -161,29 +160,29 @@ public: const eRect& getGlyphBBox(int num) const { - assert(num >= 0); - assert(num < (int)glyphs.size()); + ASSERT(num >= 0); + ASSERT(num < (int)glyphs.size()); return glyphs[num].bbox; } void setGlyphFlag(int g, int f) { - assert(g >= 0); - assert(g < (int)glyphs.size()); + ASSERT(g >= 0); + ASSERT(g < (int)glyphs.size()); glyphs[g].flags |= f; } void clearGlyphFlag(int g, int f) { - assert(g >= 0); - assert(g < (int)glyphs.size()); + ASSERT(g >= 0); + ASSERT(g < (int)glyphs.size()); glyphs[g].flags |= f; } }; class Font: public iObject { -DECLARE_REF(Font); + DECLARE_REF(Font); public: #ifdef HAVE_FREETYPE2 FTC_ScalerRec scaler;