diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/poppler/GfxFont.h')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/poppler/GfxFont.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h index 85bdea13785..5985912a8c2 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h +++ b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005, 2008, 2015 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2005, 2008, 2015, 2017 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de> // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com> // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org> @@ -322,15 +322,15 @@ public: Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict); - virtual int getNextChar(char *s, int len, CharCode *code, + int getNextChar(char *s, int len, CharCode *code, Unicode **u, int *uLen, - double *dx, double *dy, double *ox, double *oy); + double *dx, double *dy, double *ox, double *oy) override; // Return the encoding. char **getEncoding() { return enc; } // Return the Unicode map. - CharCodeToUnicode *getToUnicode(); + CharCodeToUnicode *getToUnicode() override; // Return the character name associated with <code>. char *getCharName(int code) { return enc[code]; } @@ -352,13 +352,14 @@ public: Dict *getCharProcs(); // Return the Type 3 CharProc for the character associated with <code>. - Object *getCharProc(int code, Object *proc); + Object getCharProc(int code); + Object getCharProcNF(int code); // Return the Type 3 Resources dictionary, or NULL if none. Dict *getResources(); private: - virtual ~Gfx8BitFont(); + ~Gfx8BitFont(); const Base14FontMapEntry *base14; // for Base-14 fonts only; NULL otherwise char *enc[256]; // char code --> char name @@ -384,17 +385,17 @@ public: GfxCIDFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict); - virtual GBool isCIDFont() { return gTrue; } + GBool isCIDFont() override { return gTrue; } - virtual int getNextChar(char *s, int len, CharCode *code, + int getNextChar(char *s, int len, CharCode *code, Unicode **u, int *uLen, - double *dx, double *dy, double *ox, double *oy); + double *dx, double *dy, double *ox, double *oy) override; // Return the writing mode (0=horizontal, 1=vertical). - virtual int getWMode(); + int getWMode() override; // Return the Unicode map. - CharCodeToUnicode *getToUnicode(); + CharCodeToUnicode *getToUnicode() override; // Get the collection name (<registry>-<ordering>). GooString *getCollection(); @@ -409,7 +410,7 @@ public: double getWidth(char* s, int len); private: - virtual ~GfxCIDFont(); + ~GfxCIDFont(); int mapCodeToGID(FoFiTrueType *ff, int cmapi, Unicode unicode, GBool wmode); |