diff options
Diffstat (limited to 'xfa/fgas/font')
-rw-r--r-- | xfa/fgas/font/cfgas_gefont.cpp | 50 | ||||
-rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 9 |
2 files changed, 0 insertions, 59 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp index 7abc3bccb0..fdeb2ce533 100644 --- a/xfa/fgas/font/cfgas_gefont.cpp +++ b/xfa/fgas/font/cfgas_gefont.cpp @@ -54,29 +54,6 @@ CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont( return pFont; } -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -// static -CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, - int32_t iLength, - CFGAS_FontMgr* pFontMgr) { - auto pFont = pdfium::MakeRetain<CFGAS_GEFont>(pFontMgr); - if (pFont->LoadFontInternal(pBuffer, iLength)) - return nullptr; - return pFont; -} - -// static -CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont( - const CFX_RetainPtr<IFGAS_Stream>& pFontStream, - CFGAS_FontMgr* pFontMgr, - bool bSaveStream) { - auto pFont = pdfium::MakeRetain<CFGAS_GEFont>(pFontMgr); - if (!pFont->LoadFontInternal(pFontStream, bSaveStream)) - return nullptr; - return pFont; -} -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr) : #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ @@ -159,33 +136,6 @@ bool CFGAS_GEFont::LoadFontInternal(const wchar_t* pszFontFamily, return false; return InitFont(); } - -bool CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) { - if (m_pFont) - return false; - - m_pFont = new CFX_Font; - if (!m_pFont->LoadEmbedded(pBuffer, length)) - return false; - return InitFont(); -} - -bool CFGAS_GEFont::LoadFontInternal( - const CFX_RetainPtr<IFGAS_Stream>& pFontStream, - bool bSaveStream) { - if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) - return false; - if (bSaveStream) - m_pStream = pFontStream; - - m_pFileRead = pFontStream->MakeSeekableReadStream(); - m_pFont = new CFX_Font; - if (!m_pFont->LoadFile(m_pFileRead)) { - m_pFileRead.Reset(); - return false; - } - return InitFont(); -} #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ bool CFGAS_GEFont::LoadFontInternal(CFX_Font* pExternalFont) { diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index b460cee496..14029be1e0 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -37,15 +37,6 @@ class CFGAS_GEFont : public CFX_Retainable { static CFX_RetainPtr<CFGAS_GEFont> LoadFont( std::unique_ptr<CFX_Font> pInternalFont, CFGAS_FontMgr* pFontMgr); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - static CFX_RetainPtr<CFGAS_GEFont> LoadFont(const uint8_t* pBuffer, - int32_t iLength, - CFGAS_FontMgr* pFontMgr); - static CFX_RetainPtr<CFGAS_GEFont> LoadFont( - const CFX_RetainPtr<IFGAS_Stream>& pFontStream, - CFGAS_FontMgr* pFontMgr, - bool bSaveStream); -#endif CFX_RetainPtr<CFGAS_GEFont> Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0); |