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_cidfont.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_cidfont.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_font/cpdf_cidfont.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp index 8de2c98a84..0dcbf48be2 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp @@ -7,6 +7,7 @@ #include "core/fpdfapi/fpdf_font/cpdf_cidfont.h" #include <algorithm> +#include <vector> #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" @@ -627,15 +628,16 @@ int CPDF_CIDFont::GlyphFromCharCode(uint32_t charcode, bool* pVertGlyph) { return charcode ? static_cast<int>(charcode) : -1; charcode += 31; - FX_BOOL bMSUnicode = FT_UseTTCharmap(face, 3, 1); - FX_BOOL bMacRoman = bMSUnicode ? FALSE : FT_UseTTCharmap(face, 1, 0); + bool bMSUnicode = FT_UseTTCharmap(face, 3, 1); + bool bMacRoman = !bMSUnicode && FT_UseTTCharmap(face, 1, 0); int iBaseEncoding = PDFFONT_ENCODING_STANDARD; if (bMSUnicode) { iBaseEncoding = PDFFONT_ENCODING_WINANSI; } else if (bMacRoman) { iBaseEncoding = PDFFONT_ENCODING_MACROMAN; } - const FX_CHAR* name = GetAdobeCharName(iBaseEncoding, nullptr, charcode); + const FX_CHAR* name = GetAdobeCharName( + iBaseEncoding, std::vector<CFX_ByteString>(), charcode); if (!name) return charcode ? static_cast<int>(charcode) : -1; |