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>
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h
index 0a6b3e7..a2d16ed 100644
--- a/core/fpdfapi/font/cpdf_cidfont.h
+++ b/core/fpdfapi/font/cpdf_cidfont.h
@@ -48,7 +48,6 @@
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 @@
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 c7725c3..0b76cee 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -122,10 +122,6 @@
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 244ab72..0a46f65 100644
--- a/core/fpdfapi/font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -66,7 +66,6 @@
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 @@
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 @@
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);
