diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-03 16:32:19 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-03 16:32:19 +0000 |
| commit | 232b918d1f0faec230652f4097b834257a7dbb27 (patch) | |
| tree | c13213ab3d70cc147a6ea59b0f090a51beecae8f /core/fpdfapi/font | |
| parent | 36d7ad4a24287b562e1d88fcde635e36a167bfe3 (diff) | |
| download | pdfium-232b918d1f0faec230652f4097b834257a7dbb27.tar.xz | |
Re-arrange so inline vectors come last in structs.
This might make the memory tools more effective in finding OOBs.
Change-Id: Id093bb0a88c37954c80d612ac00b5a168e75bdbf
Reviewed-on: https://pdfium-review.googlesource.com/29550
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/font')
| -rw-r--r-- | core/fpdfapi/font/cpdf_cidfont.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_cmapparser.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_simplefont.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h index 68fce2ccb6..0bf5f7ace1 100644 --- a/core/fpdfapi/font/cpdf_cidfont.h +++ b/core/fpdfapi/font/cpdf_cidfont.h @@ -81,13 +81,13 @@ class CPDF_CIDFont : public CPDF_Font { uint16_t m_DefaultWidth; RetainPtr<CPDF_StreamAcc> m_pStreamAcc; bool m_bAnsiWidthsFixed; - FX_RECT m_CharBBox[256]; std::vector<uint32_t> m_WidthList; short m_DefaultVY; short m_DefaultW1; std::vector<uint32_t> m_VertMetrics; bool m_bAdobeCourierStd; std::unique_ptr<CFX_CTTGSUBTable> m_pTTGSUBTable; + FX_RECT m_CharBBox[256]; }; #endif // CORE_FPDFAPI_FONT_CPDF_CIDFONT_H_ diff --git a/core/fpdfapi/font/cpdf_cmapparser.h b/core/fpdfapi/font/cpdf_cmapparser.h index fc46c58f72..c70d408f90 100644 --- a/core/fpdfapi/font/cpdf_cmapparser.h +++ b/core/fpdfapi/font/cpdf_cmapparser.h @@ -40,10 +40,10 @@ class CPDF_CMapParser { UnownedPtr<CPDF_CMap> const m_pCMap; int m_Status; int m_CodeSeq; - uint32_t m_CodePoints[4]; std::vector<CPDF_CMap::CodeRange> m_CodeRanges; std::vector<CPDF_CMap::CIDRange> m_AdditionalCharcodeToCIDMappings; ByteString m_LastWord; + uint32_t m_CodePoints[4]; }; #endif // CORE_FPDFAPI_FONT_CPDF_CMAPPARSER_H_ diff --git a/core/fpdfapi/font/cpdf_simplefont.h b/core/fpdfapi/font/cpdf_simplefont.h index 9cb730d1a1..3aa68d73a6 100644 --- a/core/fpdfapi/font/cpdf_simplefont.h +++ b/core/fpdfapi/font/cpdf_simplefont.h @@ -39,13 +39,13 @@ class CPDF_SimpleFont : public CPDF_Font { void LoadCharMetrics(int charcode); CPDF_FontEncoding m_Encoding; + int m_BaseEncoding; + bool m_bUseFontWidth; + std::vector<ByteString> m_CharNames; uint16_t m_GlyphIndex[256]; uint16_t m_ExtGID[256]; - std::vector<ByteString> m_CharNames; - int m_BaseEncoding; uint16_t m_CharWidth[256]; FX_RECT m_CharBBox[256]; - bool m_bUseFontWidth; }; #endif // CORE_FPDFAPI_FONT_CPDF_SIMPLEFONT_H_ |