summaryrefslogtreecommitdiff
path: root/xfa/fgas/font
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-07-18 13:14:49 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-18 13:14:49 -0700
commit34965459f4f53a77f6c925292304eface57d12c6 (patch)
tree788cb62af316f8b5c5d520583eaa0313dd48144e /xfa/fgas/font
parentaae4566ee8b2eaffb182861047c466ed1ec04902 (diff)
downloadpdfium-34965459f4f53a77f6c925292304eface57d12c6.tar.xz
Cleanup fgas/crt.
This CL removes unused methods and default parameters from the fgas/crt code. Review-Url: https://codereview.chromium.org/2162503003
Diffstat (limited to 'xfa/fgas/font')
-rw-r--r--xfa/fgas/font/fgas_gefont.cpp6
-rw-r--r--xfa/fgas/font/fgas_gefont.h2
-rw-r--r--xfa/fgas/font/fgas_stdfontmgr.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp
index a7d8c49cbf..576f482df2 100644
--- a/xfa/fgas/font/fgas_gefont.cpp
+++ b/xfa/fgas/font/fgas_gefont.cpp
@@ -219,7 +219,7 @@ FX_BOOL CFGAS_GEFont::LoadFontInternal(IFX_Stream* pFontStream,
if (bSaveStream) {
m_pStream = pFontStream;
}
- m_pFileRead = FX_CreateFileRead(pFontStream);
+ m_pFileRead = FX_CreateFileRead(pFontStream, FALSE);
m_pFont = new CFX_Font;
FX_BOOL bRet = m_pFont->LoadFile(m_pFileRead);
if (bRet) {
@@ -250,7 +250,7 @@ FX_BOOL CFGAS_GEFont::InitFont() {
return FALSE;
}
if (!m_pCharWidthMap)
- m_pCharWidthMap = new CFX_WordDiscreteArray(1024);
+ m_pCharWidthMap = new CFX_DiscreteArrayTemplate<uint16_t>(1024);
if (!m_pRectArray)
m_pRectArray = new CFX_MassArrayTemplate<CFX_Rect>(16);
if (!m_pBBoxMap)
@@ -473,7 +473,7 @@ void CFGAS_GEFont::Reset() {
m_pBBoxMap->RemoveAll();
}
if (m_pRectArray) {
- m_pRectArray->RemoveAll();
+ m_pRectArray->RemoveAll(FALSE);
}
}
CFGAS_GEFont* CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h
index 5d7b664cf9..a94583fa65 100644
--- a/xfa/fgas/font/fgas_gefont.h
+++ b/xfa/fgas/font/fgas_gefont.h
@@ -98,7 +98,7 @@ class CFGAS_GEFont {
IFX_Stream* m_pStream;
IFX_FileRead* m_pFileRead;
CFX_UnicodeEncoding* m_pFontEncoding;
- CFX_WordDiscreteArray* m_pCharWidthMap;
+ CFX_DiscreteArrayTemplate<uint16_t>* m_pCharWidthMap;
CFX_MassArrayTemplate<CFX_Rect>* m_pRectArray;
CFX_MapPtrToPtr* m_pBBoxMap;
CXFA_PDFFontMgr* m_pProvider;
diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp
index 47ec72b807..8af3f22b9a 100644
--- a/xfa/fgas/font/fgas_stdfontmgr.cpp
+++ b/xfa/fgas/font/fgas_stdfontmgr.cpp
@@ -20,7 +20,7 @@ IFGAS_FontMgr* IFGAS_FontMgr::Create(FX_LPEnumAllFonts pEnumerator) {
CFGAS_StdFontMgrImp::CFGAS_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator)
: m_pEnumerator(pEnumerator),
- m_FontFaces(),
+ m_FontFaces(100),
m_CPFonts(8),
m_FamilyFonts(16),
m_UnicodeFonts(16),
@@ -33,7 +33,7 @@ CFGAS_StdFontMgrImp::CFGAS_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator)
}
CFGAS_StdFontMgrImp::~CFGAS_StdFontMgrImp() {
- m_FontFaces.RemoveAll();
+ m_FontFaces.RemoveAll(FALSE);
m_CPFonts.RemoveAll();
m_FamilyFonts.RemoveAll();
m_UnicodeFonts.RemoveAll();
@@ -298,7 +298,7 @@ FX_FONTDESCRIPTOR const* CFGAS_StdFontMgrImp::FindFont(
return pDesc;
}
if (pszFontFamily && m_pEnumerator) {
- CFX_FontDescriptors namedFonts;
+ CFX_FontDescriptors namedFonts(100);
m_pEnumerator(namedFonts, pszFontFamily, wUnicode);
params.pwsFamily = nullptr;
pDesc = FX_DefFontMatcher(&params, namedFonts);