diff options
Diffstat (limited to 'xfa/fgas/font')
-rw-r--r-- | xfa/fgas/font/cfgas_gefont.cpp | 5 | ||||
-rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp index c1dfa2b5b9..1d4624fb0d 100644 --- a/xfa/fgas/font/cfgas_gefont.cpp +++ b/xfa/fgas/font/cfgas_gefont.cpp @@ -72,7 +72,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, } // static -CFGAS_GEFont* CFGAS_GEFont::LoadFont(IFX_Stream* pFontStream, +CFGAS_GEFont* CFGAS_GEFont::LoadFont(IFGAS_Stream* pFontStream, CFGAS_FontMgr* pFontMgr, bool bSaveStream) { CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr); @@ -203,7 +203,8 @@ bool CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) { return InitFont(); } -bool CFGAS_GEFont::LoadFontInternal(IFX_Stream* pFontStream, bool bSaveStream) { +bool CFGAS_GEFont::LoadFontInternal(IFGAS_Stream* pFontStream, + bool bSaveStream) { if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) return false; if (bSaveStream) diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index acad51af79..2b4179e711 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -33,7 +33,7 @@ class CFGAS_GEFont { static CFGAS_GEFont* LoadFont(const uint8_t* pBuffer, int32_t iLength, CFGAS_FontMgr* pFontMgr); - static CFGAS_GEFont* LoadFont(IFX_Stream* pFontStream, + static CFGAS_GEFont* LoadFont(IFGAS_Stream* pFontStream, CFGAS_FontMgr* pFontMgr, bool bSaveStream); #endif @@ -69,7 +69,7 @@ class CFGAS_GEFont { uint32_t dwFontStyles, uint16_t wCodePage); bool LoadFontInternal(const uint8_t* pBuffer, int32_t length); - bool LoadFontInternal(IFX_Stream* pFontStream, bool bSaveStream); + bool LoadFontInternal(IFGAS_Stream* pFontStream, bool bSaveStream); #endif bool LoadFontInternal(CFX_Font* pExternalFont); bool LoadFontInternal(std::unique_ptr<CFX_Font> pInternalFont); @@ -97,7 +97,7 @@ class CFGAS_GEFont { CFGAS_FontMgr* const m_pFontMgr; int32_t m_iRefCount; bool m_bExternalFont; - std::unique_ptr<IFX_Stream, ReleaseDeleter<IFX_Stream>> m_pStream; + std::unique_ptr<IFGAS_Stream, ReleaseDeleter<IFGAS_Stream>> m_pStream; std::unique_ptr<IFX_SeekableReadStream, ReleaseDeleter<IFX_SeekableReadStream>> m_pFileRead; |