git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace more assertions to get proper log messages
[enigma2.git]
/
lib
/
gdi
/
font.h
diff --git
a/lib/gdi/font.h
b/lib/gdi/font.h
index dbecd493ca0a6151eda5d5c4ebf1eb0bce482b98..2643fda20215e7099aebbaaeb02a9b5274507d21 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
#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>
#include <vector>
#include <lib/gdi/fb.h>
@@
-95,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;
@@
-156,30
+160,33
@@
public:
const eRect& getGlyphBBox(int num) const
{
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)
{
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)
{
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
{
glyphs[g].flags |= f;
}
};
class Font: public iObject
{
-DECLARE_REF(Font);
+
DECLARE_REF(Font);
public:
public:
+#ifdef HAVE_FREETYPE2
+ FTC_ScalerRec scaler;
+#endif
FTC_Image_Desc font;
fontRenderClass *renderer;
FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit);
FTC_Image_Desc font;
fontRenderClass *renderer;
FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit);