diff options
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp index 0a57f54cdd..1c3d88beab 100644 --- a/xfa/fgas/font/cfgas_gefont.cpp +++ b/xfa/fgas/font/cfgas_gefont.cpp @@ -12,7 +12,6 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_font.h" #include "core/fxge/cfx_substfont.h" -#include "core/fxge/cfx_unicodeencoding.h" #include "core/fxge/cfx_unicodeencodingex.h" #include "third_party/base/ptr_util.h" #include "xfa/fgas/font/fgas_fontutils.h" @@ -57,6 +56,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont( CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr) : m_pFontMgr(pFontMgr) {} CFGAS_GEFont::~CFGAS_GEFont() { + m_pFontEncoding.reset(); // Has an UnownedPtr to |m_pFont|. if (!m_bExternalFont) delete m_pFont; } diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index 2eadd5aaae..407a232595 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -18,7 +18,7 @@ #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" -class CFX_UnicodeEncoding; +class CFX_UnicodeEncodingEx; class CFGAS_GEFont final : public Retainable { public: @@ -75,7 +75,7 @@ class CFGAS_GEFont final : public Retainable { uint32_t m_dwLogFontStyle = 0; CFX_Font* m_pFont = nullptr; CFGAS_FontMgr::ObservedPtr const m_pFontMgr; - std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding; + std::unique_ptr<CFX_UnicodeEncodingEx> m_pFontEncoding; std::map<wchar_t, int32_t> m_CharWidthMap; std::map<wchar_t, FX_RECT> m_BBoxMap; std::vector<RetainPtr<CFGAS_GEFont>> m_SubstFonts; |