diff options
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/fx_font.h | 6 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 96396af15e..224720fbc3 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -170,9 +170,7 @@ class CFX_Font { static const uint8_t s_WeightPow_SHIFTJIS[kWeightPowArraySize]; #ifdef PDF_ENABLE_XFA - protected: - CFX_BinaryBuf m_OtfFontData; bool m_bShallowCopy; FXFT_StreamRec* m_pOwnedStream; #endif // PDF_ENABLE_XFA @@ -181,13 +179,9 @@ class CFX_Font { friend class CFX_FaceCache; CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, int dest_width = 0) const; - - private: CFX_FaceCache* GetFaceCache() const; - void ReleasePlatformResource(); void DeleteFace(); - void ClearFaceCache(); FXFT_Face m_Face; diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 7be300ff66..24dcb87383 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -265,10 +265,6 @@ bool CFX_Font::LoadClone(const CFX_Font* pFont) { m_pSubstFont->m_Family = pFont->m_pSubstFont->m_Family; m_pSubstFont->m_ItalicAngle = pFont->m_pSubstFont->m_ItalicAngle; } - if (pFont->m_OtfFontData.GetSize()) { - m_OtfFontData.AttachData(pFont->m_OtfFontData.GetBuffer(), - pFont->m_OtfFontData.GetSize()); - } m_Face = pFont->m_Face; m_bEmbedded = pFont->m_bEmbedded; m_bVertical = pFont->m_bVertical; @@ -292,10 +288,8 @@ void CFX_Font::SetFace(FXFT_Face face) { CFX_Font::~CFX_Font() { #ifdef PDF_ENABLE_XFA - if (m_bShallowCopy) { - m_OtfFontData.DetachBuffer(); + if (m_bShallowCopy) return; - } #endif // PDF_ENABLE_XFA if (m_Face) { #ifndef PDF_ENABLE_XFA |