diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-09-17 18:25:32 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-17 18:25:32 +0000 |
| commit | cb798258c433bec7087948fcbfff14d1e7683006 (patch) | |
| tree | bc873a405dbfe7c957d75a1748acce11c7f473e7 /core/fpdfapi/font | |
| parent | c5709dd345c748016a637b2104544895223f8fc7 (diff) | |
| download | pdfium-cb798258c433bec7087948fcbfff14d1e7683006.tar.xz | |
Fix final/protected conflicts.
Classes marked |final| should not have |protected| members. In turn,
"private field m_dwEncryptObjNum is not used" warning is produced.
Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327
Reviewed-on: https://pdfium-review.googlesource.com/42611
Reviewed-by: Lei Zhang <thestig@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_truetypefont.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_type3font.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h index 7aeb54b877..5cbeeda7f5 100644 --- a/core/fpdfapi/font/cpdf_cidfont.h +++ b/core/fpdfapi/font/cpdf_cidfont.h @@ -62,7 +62,7 @@ class CPDF_CIDFont final : public CPDF_Font { void GetVertOrigin(uint16_t CID, short& vx, short& vy) const; int GetCharSize(uint32_t charcode) const; - protected: + private: void LoadGB2312(); int GetGlyphIndex(uint32_t unicodeb, bool* pVertGlyph); int GetVerticalGlyph(int index, bool* pVertGlyph); diff --git a/core/fpdfapi/font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h index a3066d74fa..158a5df85c 100644 --- a/core/fpdfapi/font/cpdf_truetypefont.h +++ b/core/fpdfapi/font/cpdf_truetypefont.h @@ -20,7 +20,7 @@ class CPDF_TrueTypeFont final : public CPDF_SimpleFont { const CPDF_TrueTypeFont* AsTrueTypeFont() const override; CPDF_TrueTypeFont* AsTrueTypeFont() override; - protected: + private: // CPDF_Font: bool Load() override; diff --git a/core/fpdfapi/font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h index d85bf701df..fb32323642 100644 --- a/core/fpdfapi/font/cpdf_type3font.h +++ b/core/fpdfapi/font/cpdf_type3font.h @@ -37,9 +37,6 @@ class CPDF_Type3Font final : public CPDF_SimpleFont { CFX_Matrix& GetFontMatrix() { return m_FontMatrix; } - protected: - CFX_Matrix m_FontMatrix; - private: // CPDF_Font: bool Load() override; @@ -47,6 +44,7 @@ class CPDF_Type3Font final : public CPDF_SimpleFont { // CPDF_SimpleFont: void LoadGlyphMap() override; + CFX_Matrix m_FontMatrix; uint32_t m_CharWidthL[256]; UnownedPtr<CPDF_Dictionary> m_pCharProcs; UnownedPtr<CPDF_Dictionary> m_pPageResources; |