diff options
author | thestig <thestig@chromium.org> | 2016-08-15 10:21:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-15 10:21:46 -0700 |
commit | 93ee11937bc2351882648f6aa1127883adbf0268 (patch) | |
tree | 066f009b0cfc721cd982e27a63f5270ccef68418 /core/fpdfapi/fpdf_font/cpdf_type1font.cpp | |
parent | c4f3c0f183c9ce472cd22e831075c3897e14c3af (diff) | |
download | pdfium-93ee11937bc2351882648f6aa1127883adbf0268.tar.xz |
Use a std::vector in fpdf_font code.
Review-Url: https://codereview.chromium.org/2248453002
Diffstat (limited to 'core/fpdfapi/fpdf_font/cpdf_type1font.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_font/cpdf_type1font.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp index 5f6eb1f662..c316d8d424 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp @@ -173,10 +173,10 @@ void CPDF_Type1Font::LoadGlyphMap() { } for (int charcode = 0; charcode < 256; charcode++) { const FX_CHAR* name = - GetAdobeCharName(m_BaseEncoding, m_pCharNames, charcode); - if (!name) { + GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); + if (!name) continue; - } + m_Encoding.m_Unicodes[charcode] = PDF_UnicodeFromAdobeName(name); m_GlyphIndex[charcode] = FXFT_Get_Char_Index( m_Font.GetFace(), m_Encoding.m_Unicodes[charcode]); @@ -225,7 +225,7 @@ void CPDF_Type1Font::LoadGlyphMap() { if (m_Flags & PDFFONT_SYMBOLIC) { for (int charcode = 0; charcode < 256; charcode++) { const FX_CHAR* name = - GetAdobeCharName(m_BaseEncoding, m_pCharNames, charcode); + GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); if (name) { m_Encoding.m_Unicodes[charcode] = PDF_UnicodeFromAdobeName(name); m_GlyphIndex[charcode] = @@ -273,7 +273,7 @@ void CPDF_Type1Font::LoadGlyphMap() { } for (int charcode = 0; charcode < 256; charcode++) { const FX_CHAR* name = - GetAdobeCharName(m_BaseEncoding, m_pCharNames, charcode); + GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); if (!name) { continue; } @@ -331,11 +331,11 @@ void CPDF_Type1Font::LoadGlyphMap() { } return; } -#endif +#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ if (m_Flags & PDFFONT_SYMBOLIC) { for (int charcode = 0; charcode < 256; charcode++) { const FX_CHAR* name = - GetAdobeCharName(m_BaseEncoding, m_pCharNames, charcode); + GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); if (name) { m_Encoding.m_Unicodes[charcode] = PDF_UnicodeFromAdobeName(name); m_GlyphIndex[charcode] = @@ -373,7 +373,7 @@ void CPDF_Type1Font::LoadGlyphMap() { } for (int charcode = 0; charcode < 256; charcode++) { const FX_CHAR* name = - GetAdobeCharName(m_BaseEncoding, m_pCharNames, charcode); + GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); if (!name) { continue; } |