core/include/fxge/fx_font.h - Issue 1255293002: Revert "FX Bool considered harmful, part 3"

Unified Diff: core/include/fxge/fx_font.h

Issue 1255293002: Revert "FX Bool considered harmful, part 3" (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: core/include/fxge/fx_font.h

diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h

index 20ef5d42c2c5f08c87b70f6f15eaa09c6db30fd0..2832fbfcbcfdb0916b714f68a4108f3ea4ec31f2 100644

--- a/core/include/fxge/fx_font.h

+++ b/core/include/fxge/fx_font.h

@@ -56,12 +56,12 @@ public:

CFX_Font();

~CFX_Font();

- bool LoadSubst(const CFX_ByteString& face_name, bool bTrueType, FX_DWORD flags,

- int weight, int italic_angle, int CharsetCP, bool bVertical = false);

+ FX_BOOL LoadSubst(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,

+ int weight, int italic_angle, int CharsetCP, FX_BOOL bVertical = FALSE);

- bool LoadEmbedded(const uint8_t* data, FX_DWORD size);

+ FX_BOOL LoadEmbedded(const uint8_t* data, FX_DWORD size);

- bool LoadFile(IFX_FileRead* pFile);

+ FX_BOOL LoadFile(IFX_FileRead* pFile);

FXFT_Face GetFace() const

{

@@ -82,15 +82,15 @@ public:

int GetDescent() const;

- bool GetGlyphBBox(FX_DWORD glyph_index, FX_RECT &bbox);

+ FX_BOOL GetGlyphBBox(FX_DWORD glyph_index, FX_RECT &bbox);

- bool IsItalic();

+ FX_BOOL IsItalic();

- bool IsBold();

+ FX_BOOL IsBold();

- bool IsFixedWidth();

+ FX_BOOL IsFixedWidth();

- bool IsVertical() const

+ FX_BOOL IsVertical() const

{

return m_bVertical;

}

@@ -103,9 +103,9 @@ public:

CFX_ByteString GetFaceName() const;

- bool IsTTFont();

+ FX_BOOL IsTTFont();

- bool GetBBox(FX_RECT &bbox);

+ FX_BOOL GetBBox(FX_RECT &bbox);

int GetHeight();

@@ -118,7 +118,7 @@ public:

FXFT_Face m_Face;

CFX_SubstFont* m_pSubstFont;

- bool IsEmbedded()

+ FX_BOOL IsEmbedded()

{

return m_bEmbedded;

}

@@ -133,14 +133,14 @@ public:

void* m_pPlatformFont;

void* m_pPlatformFontCollection;

void* m_pDwFont;

- bool m_bDwLoaded;

+ FX_BOOL m_bDwLoaded;

void ReleasePlatformResource();

void DeleteFace();

protected:

- bool m_bEmbedded;

- bool m_bVertical;

+ FX_BOOL m_bEmbedded;

+ FX_BOOL m_bVertical;

void* m_pOwnedStream;

};

#define ENCODING_INTERNAL 0

@@ -182,11 +182,11 @@ public:

int m_ItalicAngle;

- bool m_bSubstOfCJK;

+ FX_BOOL m_bSubstOfCJK;

int m_WeightCJK;

- bool m_bItlicCJK;

+ FX_BOOL m_bItlicCJK;

};

#define FX_FONT_FLAG_SERIF 0x01

#define FX_FONT_FLAG_FIXEDPITCH 0x02

@@ -206,9 +206,9 @@ public:

~CFX_FontMgr();

void InitFTLibrary();

FXFT_Face GetCachedFace(const CFX_ByteString& face_name,

- int weight, bool bItalic, uint8_t*& pFontData);

+ int weight, FX_BOOL bItalic, uint8_t*& pFontData);

FXFT_Face AddCachedFace(const CFX_ByteString& face_name,

- int weight, bool bItalic, uint8_t* pData, FX_DWORD size, int face_index);

+ int weight, FX_BOOL bItalic, uint8_t* pData, FX_DWORD size, int face_index);

FXFT_Face GetCachedTTCFace(int ttc_size, FX_DWORD checksum,

int font_offset, uint8_t*& pFontData);

FXFT_Face AddCachedTTCFace(int ttc_size, FX_DWORD checksum,

@@ -217,12 +217,12 @@ public:

FXFT_Face GetFixedFace(const uint8_t* pData, FX_DWORD size, int face_index);

void ReleaseFace(FXFT_Face face);

void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);

- FXFT_Face FindSubstFont(const CFX_ByteString& face_name, bool bTrueType, FX_DWORD flags,

+ FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,

int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);

void FreeCache();

- bool GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);

+ FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);

CFX_FontMapper* m_pBuiltinMapper;

IFX_FontMapper* m_pExtMapper;

CFX_MapByteStringToPtr m_FaceMap;

@@ -235,7 +235,7 @@ public:

virtual ~IFX_FontMapper() {}

- virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, bool bTrueType, FX_DWORD flags,

+ virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,

int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont) = 0;

CFX_FontMgr* m_pFontMgr;

@@ -277,14 +277,14 @@ public:

{

return m_pFontEnumerator;

}

- virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, bool bTrueType, FX_DWORD flags,

+ virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,

int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);

private:

CFX_ByteString GetPSNameFromTT(void* hFont);

CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name);

FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont, int iBaseFont, int italic_angle, int weight, int picthfamily);

- bool m_bListLoaded;

+ FX_BOOL m_bListLoaded;

FXFT_Face m_MMFaces[2];

CFX_ByteString m_LastFamily;

CFX_DWordArray m_CharsetArray;

@@ -299,12 +299,12 @@ public:

static IFX_SystemFontInfo* CreateDefault();

virtual void Release() = 0;

- virtual bool EnumFontList(CFX_FontMapper* pMapper) = 0;

- virtual void* MapFont(int weight, bool bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact) = 0;

+ virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) = 0;

+ virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact) = 0;

virtual void* GetFont(const FX_CHAR* face) = 0;

virtual FX_DWORD GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size) = 0;

- virtual bool GetFaceName(void* hFont, CFX_ByteString& name) = 0;

- virtual bool GetFontCharset(void* hFont, int& charset) = 0;

+ virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) = 0;

+ virtual FX_BOOL GetFontCharset(void* hFont, int& charset) = 0;

virtual int GetFaceIndex(void* hFont)

{

return 0;

@@ -326,15 +326,15 @@ public:

// IFX_SytemFontInfo:

void Release() override;

- bool EnumFontList(CFX_FontMapper* pMapper) override;

- void* MapFont(int weight, bool bItalic, int charset, int pitch_family,

+ FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;

+ void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family,

const FX_CHAR* face, int& bExact) override;

void* GetFont(const FX_CHAR* face) override;

FX_DWORD GetFontData(void* hFont, FX_DWORD table,

uint8_t* buffer, FX_DWORD size) override;

void DeleteFont(void* hFont) override;

- bool GetFaceName(void* hFont, CFX_ByteString& name) override;

- bool GetFontCharset(void* hFont, int& charset) override;

+ FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;

+ FX_BOOL GetFontCharset(void* hFont, int& charset) override;

protected:

CFX_MapByteStringToPtr m_FontList;

@@ -357,7 +357,7 @@ public:

~CFX_FontCache();

CFX_FaceCache* GetCachedFace(CFX_Font* pFont);

void ReleaseCachedFace(CFX_Font* pFont);

- void FreeCache(bool bRelease = false);

+ void FreeCache(FX_BOOL bRelease = FALSE);

private:

using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;

@@ -391,7 +391,7 @@ class CFX_FaceCache

{

public:

~CFX_FaceCache();

- const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, bool bFontStyle, const CFX_AffineMatrix* pMatrix,

+ const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, const CFX_AffineMatrix* pMatrix,

int dest_width, int anti_alias, int& text_flags);

const CFX_PathData* LoadGlyphPath(CFX_Font* pFont, FX_DWORD glyph_index, int dest_width);

@@ -399,12 +399,12 @@ public:

CFX_FaceCache(FXFT_Face face);

private:

FXFT_Face m_Face;

- CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_index, bool bFontStyle,

+ CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle,

const CFX_AffineMatrix* pMatrix, int dest_width, int anti_alias);

CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, FX_DWORD glyph_index,

const CFX_AffineMatrix* pMatrix, int dest_width, int anti_alias);

CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, const CFX_AffineMatrix* pMatrix, CFX_ByteStringC& FaceGlyphsKey,

- FX_DWORD glyph_index, bool bFontStyle, int dest_width, int anti_alias);

+ FX_DWORD glyph_index, FX_BOOL bFontStyle, int dest_width, int anti_alias);

CFX_MapByteStringToPtr m_SizeMap;

CFX_MapPtrToPtr m_PathMap;

CFX_DIBitmap* m_pBitmap;

@@ -418,16 +418,16 @@ typedef struct {

FX_FLOAT m_fOriginX, m_fOriginY;

} FXTEXT_GLYPHPOS;

FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos, int nChars, int anti_alias, FX_FLOAT retinaScaleX = 1.0f, FX_FLOAT retinaScaleY = 1.0f);

-bool OutputGlyph(void* dib, int x, int y, CFX_Font* pFont, double font_size,

+FX_BOOL OutputGlyph(void* dib, int x, int y, CFX_Font* pFont, double font_size,

CFX_AffineMatrix* pMatrix, unsigned long glyph_index, unsigned long argb);

-bool OutputText(void* dib, int x, int y, CFX_Font* pFont, double font_size,

+FX_BOOL OutputText(void* dib, int x, int y, CFX_Font* pFont, double font_size,

CFX_AffineMatrix* pText_matrix, unsigned short const* text, unsigned long argb);

class IFX_GSUBTable

{

public:

static IFX_GSUBTable* Create(CFX_Font* pFont);

virtual ~IFX_GSUBTable() { }

- virtual bool GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;

+ virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;

};

#endif // CORE_INCLUDE_FXGE_FX_FONT_H_

« no previous file with comments | « core/include/fxge/fx_dib.h ('k') | core/include/fxge/fx_ge.h » ('j') | no next file with comments »