diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 8 | ||||
| -rw-r--r-- | core/fxge/include/fx_font.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 4aefec8d43..3d2e6d6499 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -220,7 +220,7 @@ const uint8_t CFX_Font::s_WeightPow_SHIFTJIS[] = { CFX_Font::CFX_Font() : #ifdef PDF_ENABLE_XFA - m_bLogic(FALSE), + m_bShallowCopy(false), m_pOwnedStream(nullptr), #endif // PDF_ENABLE_XFA m_Face(nullptr), @@ -239,7 +239,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) { if (!pFont) return FALSE; - m_bLogic = TRUE; + m_bShallowCopy = true; if (pFont->m_pSubstFont) { m_pSubstFont.reset(new CFX_SubstFont); m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset; @@ -268,7 +268,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) { CFX_Font::~CFX_Font() { #ifdef PDF_ENABLE_XFA - if (m_bLogic) { + if (m_bShallowCopy) { m_OtfFontData.DetachBuffer(); return; } @@ -285,7 +285,7 @@ CFX_Font::~CFX_Font() { CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face); } #ifdef PDF_ENABLE_XFA - FX_Free(m_pOwnedStream); + delete m_pOwnedStream; #endif // PDF_ENABLE_XFA FX_Free(m_pGsubData); #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ && !defined _SKIA_SUPPORT_ diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h index cdde643770..a607f3e0d5 100644 --- a/core/fxge/include/fx_font.h +++ b/core/fxge/include/fx_font.h @@ -151,8 +151,8 @@ class CFX_Font { #ifdef PDF_ENABLE_XFA protected: CFX_BinaryBuf m_OtfFontData; - FX_BOOL m_bLogic; - void* m_pOwnedStream; + bool m_bShallowCopy; + FXFT_StreamRec* m_pOwnedStream; #endif // PDF_ENABLE_XFA private: |