summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc')
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
index b785826d66b..91226da0421 100644
--- a/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
@@ -17,6 +17,7 @@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.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
@@ -25,8 +26,6 @@
#include <config.h>
-#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
-
#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif
@@ -65,7 +64,7 @@ SplashFTFont::SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA,
FT_Face face;
int div;
int x, y;
-#if USE_FIXEDPOINT
+#ifdef USE_FIXEDPOINT
SplashCoord scale;
#endif
@@ -87,7 +86,7 @@ SplashFTFont::SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA,
div = face->bbox.xMax > 20000 ? 65536 : 1;
-#if USE_FIXEDPOINT
+#ifdef USE_FIXEDPOINT
scale = (SplashCoord)1 / (SplashCoord)face->units_per_EM;
// transform the four corners of the font bounding box -- the min
@@ -204,7 +203,7 @@ SplashFTFont::SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA,
}
// compute the transform matrix
-#if USE_FIXEDPOINT
+#ifdef USE_FIXEDPOINT
matrix.xx = (FT_Fixed)((mat[0] / size).get16Dot16());
matrix.yx = (FT_Fixed)((mat[1] / size).get16Dot16());
matrix.xy = (FT_Fixed)((mat[2] / size).get16Dot16());
@@ -509,5 +508,3 @@ static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
p->needClose = gTrue;
return 0;
}
-
-#endif // HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H