summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h')
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
index 8c0dba116d5..12fa598f152 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
@@ -18,7 +18,7 @@
// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
//
// To see a description of the changes please see the Changelog file that
@@ -74,7 +74,7 @@ protected:
class CairoFreeTypeFont : public CairoFont {
public:
static CairoFreeTypeFont *create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
- virtual ~CairoFreeTypeFont();
+ ~CairoFreeTypeFont();
private:
CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
@@ -88,9 +88,9 @@ public:
static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc,
CairoFontEngine *fontEngine,
GBool printing, XRef *xref);
- virtual ~CairoType3Font();
+ ~CairoType3Font();
- virtual GBool matches(Ref &other, GBool printing);
+ GBool matches(Ref &other, GBool printing) override;
private:
CairoType3Font(Ref ref, PDFDoc *doc,
@@ -121,7 +121,7 @@ private:
CairoFont *fontCache[cairoFontCacheSize];
FT_Library lib;
GBool useCIDs;
-#if MULTITHREADED
+#ifdef MULTITHREADED
GooMutex mutex;
#endif
};