diff options
| author | Nicolas Pena <npm@chromium.org> | 2016-11-30 13:10:14 -0500 |
|---|---|---|
| committer | Nicolás Peña <npm@chromium.org> | 2016-11-30 18:11:36 +0000 |
| commit | 47718fbaf24000877aff58d9512b9b1dea0af818 (patch) | |
| tree | 28caae0e5d5915e3661c11c254d9182ffcd79a59 /core/fpdfapi/font | |
| parent | b90c71a7b8530c5bd15740d0bb680f097920cd65 (diff) | |
| download | pdfium-47718fbaf24000877aff58d9512b9b1dea0af818.tar.xz | |
Remove unused methods from CPDF_Font
Removed unused methods, and GetCharSize no longer overrides.
Change-Id: I29384afb4d79cfd8e8b4ede4a0b52272020bfcd9
Reviewed-on: https://pdfium-review.googlesource.com/2031
Reviewed-by: ooo 11-24 -- 12-05 (dsinclair) <dsinclair@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_font.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_font.h | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h index 0a6b3e7871..a2d16ed14c 100644 --- a/core/fpdfapi/font/cpdf_cidfont.h +++ b/core/fpdfapi/font/cpdf_cidfont.h @@ -48,7 +48,6 @@ class CPDF_CIDFont : public CPDF_Font { int& offset) const override; int CountChar(const FX_CHAR* pString, int size) const override; int AppendChar(FX_CHAR* str, uint32_t charcode) const override; - int GetCharSize(uint32_t charcode) const override; bool IsVertWriting() const override; bool IsUnicodeCompatible() const override; bool Load() override; @@ -59,6 +58,7 @@ class CPDF_CIDFont : public CPDF_Font { const uint8_t* GetCIDTransform(uint16_t CID) const; short GetVertWidth(uint16_t CID) const; void GetVertOrigin(uint16_t CID, short& vx, short& vy) const; + int GetCharSize(uint32_t charcode) const; protected: void LoadGB2312(); diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp index c7725c3fce..0b76ceedff 100644 --- a/core/fpdfapi/font/cpdf_font.cpp +++ b/core/fpdfapi/font/cpdf_font.cpp @@ -122,10 +122,6 @@ int CPDF_Font::CountChar(const FX_CHAR* pString, int size) const { return size; } -int CPDF_Font::GetCharSize(uint32_t charcode) const { - return 1; -} - int CPDF_Font::GlyphFromCharCodeExt(uint32_t charcode) { return GlyphFromCharCode(charcode, nullptr); } diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h index 244ab72158..0a46f65fe0 100644 --- a/core/fpdfapi/font/cpdf_font.h +++ b/core/fpdfapi/font/cpdf_font.h @@ -66,7 +66,6 @@ class CPDF_Font { int& offset) const; virtual int CountChar(const FX_CHAR* pString, int size) const; virtual int AppendChar(FX_CHAR* buf, uint32_t charcode) const; - virtual int GetCharSize(uint32_t charcode) const; virtual int GlyphFromCharCode(uint32_t charcode, bool* pVertGlyph) = 0; virtual int GlyphFromCharCodeExt(uint32_t charcode); virtual CFX_WideString UnicodeFromCharCode(uint32_t charcode) const; @@ -74,9 +73,7 @@ class CPDF_Font { const CFX_ByteString& GetBaseFont() const { return m_BaseFont; } CFX_SubstFont* GetSubstFont() const { return m_Font.GetSubstFont(); } - uint32_t GetFlags() const { return m_Flags; } bool IsEmbedded() const { return IsType3Font() || m_pFontFile != nullptr; } - CPDF_StreamAcc* GetFontFile() const { return m_pFontFile; } CPDF_Dictionary* GetFontDict() const { return m_pFontDict; } bool IsStandardFont() const; FXFT_Face GetFace() const { return m_Font.GetFace(); } @@ -85,8 +82,6 @@ class CPDF_Font { void GetFontBBox(FX_RECT& rect) const { rect = m_FontBBox; } int GetTypeAscent() const { return m_Ascent; } int GetTypeDescent() const { return m_Descent; } - int GetItalicAngle() const { return m_ItalicAngle; } - int GetStemV() const { return m_StemV; } int GetStringWidth(const FX_CHAR* pString, int size); uint32_t FallbackFontFromCharcode(uint32_t charcode); int FallbackGlyphFromCharcode(int fallbackFont, uint32_t charcode); |