summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h')
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
index d642af0a0ab..5931be3fe73 100644
--- a/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
@@ -12,6 +12,8 @@
// under GPL version 2 or later
//
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
+// Copyright (C) 2017 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -21,8 +23,6 @@
#ifndef SPLASHFTFONTFILE_H
#define SPLASHFTFONTFILE_H
-#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
-
#ifdef USE_GCC_PRAGMAS
#pragma interface
#endif
@@ -55,12 +55,15 @@ public:
int codeToGIDLenA,
int faceIndexA=0);
- virtual ~SplashFTFontFile();
+ ~SplashFTFontFile();
// Create a new SplashFTFont, i.e., a scaled instance of this font
// file.
- virtual SplashFont *makeFont(SplashCoord *mat,
- SplashCoord *textMat);
+ SplashFont *makeFont(SplashCoord *mat,
+ SplashCoord *textMat) override;
+
+ // Provide access to the code-to-GID map
+ int* getCodeToGID();
private:
@@ -81,6 +84,4 @@ private:
friend class SplashFTFont;
};
-#endif // HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
-
#endif