summaryrefslogtreecommitdiff
path: root/xfa/fgas
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas')
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.cpp23
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.h2
2 files changed, 11 insertions, 14 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 060dd95b48..d7e7e8ed84 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -566,10 +566,12 @@ FX_POSITION CFX_FontSourceEnum_File::GetStartPosition() {
return (FX_POSITION)-1;
}
-IFX_FileAccess* CFX_FontSourceEnum_File::GetNext(FX_POSITION& pos) {
- IFX_FileAccess* pAccess = IFX_FileAccess::CreateDefault(m_wsNext.AsStringC());
+CFX_RetainPtr<IFX_FileAccess> CFX_FontSourceEnum_File::GetNext(
+ FX_POSITION& pos) {
+ CFX_RetainPtr<IFX_FileAccess> pAccess =
+ IFX_FileAccess::CreateDefault(m_wsNext.AsStringC());
m_wsNext = GetNextFile().UTF8Decode();
- pos = m_wsNext.GetLength() != 0 ? pAccess : nullptr;
+ pos = m_wsNext.GetLength() != 0 ? pAccess.Get() : nullptr;
return pAccess;
}
@@ -636,17 +638,12 @@ bool CFGAS_FontMgr::EnumFontsFromFontMapper() {
bool CFGAS_FontMgr::EnumFontsFromFiles() {
CFX_GEModule::Get()->GetFontMgr()->InitFTLibrary();
FX_POSITION pos = m_pFontSource->GetStartPosition();
- IFX_FileAccess* pFontSource = nullptr;
- CFX_RetainPtr<IFX_SeekableReadStream> pFontStream;
while (pos) {
- pFontSource = m_pFontSource->GetNext(pos);
- pFontStream = pFontSource->CreateFileStream(FX_FILEMODE_ReadOnly);
- if (!pFontStream) {
- pFontSource->Release();
- continue;
- }
- RegisterFaces(pFontStream, nullptr);
- pFontSource->Release();
+ CFX_RetainPtr<IFX_FileAccess> pFontSource = m_pFontSource->GetNext(pos);
+ CFX_RetainPtr<IFX_SeekableReadStream> pFontStream =
+ pFontSource->CreateFileStream(FX_FILEMODE_ReadOnly);
+ if (pFontStream)
+ RegisterFaces(pFontStream, nullptr);
}
return m_InstalledFonts.GetSize() != 0;
}
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 28a8bb528a..d3eb8f1a85 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -179,7 +179,7 @@ class CFX_FontSourceEnum_File {
~CFX_FontSourceEnum_File();
FX_POSITION GetStartPosition();
- IFX_FileAccess* GetNext(FX_POSITION& pos);
+ CFX_RetainPtr<IFX_FileAccess> GetNext(FX_POSITION& pos);
private:
CFX_ByteString GetNextFile();