diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-01-09 11:46:17 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-01-09 11:46:17 -0800 |
| commit | e5b59cacbb7ed6bcefe25d736a315753dd764594 (patch) | |
| tree | 973eb3e80739558ba3c06f8b06358bfb1c79581c /core/include/fxge/fx_font.h | |
| parent | 1c83be6bedb4dceb06ef7e8e6a5d76105d0fff4d (diff) | |
| download | pdfium-e5b59cacbb7ed6bcefe25d736a315753dd764594.tar.xz | |
merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.
Original at URL: https://codereview.chromium.org/810883005
Note that the new code in XFA introduces many more of these, to be handled
separately.
TBR=brucedawson@chromium.org
TBR=thestig@chromium.org
BUG=https://code.google.com/p/pdfium/issues/detail?id=102
Review URL: https://codereview.chromium.org/842223004
Diffstat (limited to 'core/include/fxge/fx_font.h')
| -rw-r--r-- | core/include/fxge/fx_font.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 8744919cf8..73292a0fd1 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -274,6 +274,7 @@ public: class IFX_FontEnumerator { public: + virtual ~IFX_FontEnumerator() { } virtual void HitFont() = 0; @@ -282,6 +283,7 @@ public: class IFX_AdditionalFontEnum { public: + virtual ~IFX_AdditionalFontEnum() { } virtual int CountFiles() = 0; virtual IFX_FileStream* GetFontFile(int index) = 0; }; @@ -328,6 +330,7 @@ class IFX_SystemFontInfo : public CFX_Object public: static IFX_SystemFontInfo* CreateDefault(); virtual void Release() = 0; + virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) = 0; virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact) = 0; virtual void* MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic, int pitch_family)
@@ -347,6 +350,8 @@ public: { return NULL; } +protected: + ~IFX_SystemFontInfo() { } }; class CFX_FolderFontInfo : public IFX_SystemFontInfo { @@ -460,6 +465,9 @@ class IFX_GSUBTable public: virtual void Release() = 0; virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0; + +protected: + ~IFX_GSUBTable() { } }; IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont); #endif |