| Index: core/fxge/ge/fx_text_int.h
|
| diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h
|
| index 2ca23217c72ee7e7a81d9b0d91b4cb7107b53380..87a9b3ecedb8891ead7e85ad968fc7d6787a56f6 100644
|
| --- a/core/fxge/ge/fx_text_int.h
|
| +++ b/core/fxge/ge/fx_text_int.h
|
| @@ -17,68 +17,12 @@ struct _CFX_UniqueKeyGen {
|
| FX_CHAR m_Key[128];
|
| int m_KeyLen;
|
| };
|
| +
|
| class CFX_SizeGlyphCache {
|
| public:
|
| - CFX_SizeGlyphCache() {}
|
| + CFX_SizeGlyphCache();
|
| ~CFX_SizeGlyphCache();
|
| std::map<uint32_t, CFX_GlyphBitmap*> m_GlyphMap;
|
| };
|
| -class CTTFontDesc {
|
| - public:
|
| - CTTFontDesc() {
|
| - m_Type = 0;
|
| - m_pFontData = nullptr;
|
| - m_RefCount = 0;
|
| - }
|
| - ~CTTFontDesc();
|
| - // ret < 0, releaseface not appropriate for this object.
|
| - // ret == 0, object released
|
| - // ret > 0, object still alive, other referrers.
|
| - int ReleaseFace(FXFT_Face face);
|
| - int m_Type;
|
| - union {
|
| - struct {
|
| - FX_BOOL m_bItalic;
|
| - FX_BOOL m_bBold;
|
| - FXFT_Face m_pFace;
|
| - } m_SingleFace;
|
| - struct {
|
| - FXFT_Face m_pFaces[16];
|
| - } m_TTCFace;
|
| - };
|
| - uint8_t* m_pFontData;
|
| - int m_RefCount;
|
| -};
|
| -
|
| -#define CHARSET_FLAG_ANSI 1
|
| -#define CHARSET_FLAG_SYMBOL 2
|
| -#define CHARSET_FLAG_SHIFTJIS 4
|
| -#define CHARSET_FLAG_BIG5 8
|
| -#define CHARSET_FLAG_GB 16
|
| -#define CHARSET_FLAG_KOREAN 32
|
| -
|
| -class CFX_FontFaceInfo {
|
| - public:
|
| - CFX_FontFaceInfo(CFX_ByteString filePath,
|
| - CFX_ByteString faceName,
|
| - CFX_ByteString fontTables,
|
| - uint32_t fontOffset,
|
| - uint32_t fileSize)
|
| - : m_FilePath(filePath),
|
| - m_FaceName(faceName),
|
| - m_FontTables(fontTables),
|
| - m_FontOffset(fontOffset),
|
| - m_FileSize(fileSize),
|
| - m_Styles(0),
|
| - m_Charsets(0) {}
|
| -
|
| - const CFX_ByteString m_FilePath;
|
| - const CFX_ByteString m_FaceName;
|
| - const CFX_ByteString m_FontTables;
|
| - const uint32_t m_FontOffset;
|
| - const uint32_t m_FileSize;
|
| - uint32_t m_Styles;
|
| - uint32_t m_Charsets;
|
| -};
|
|
|
| #endif // CORE_FXGE_GE_FX_TEXT_INT_H_
|
|
|