diff options
author | Albert Astals Cid <aacid@kde.org> | 2007-06-01 18:34:48 +0000 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2007-06-01 18:34:48 +0000 |
commit | cdf70857ece0748f13b11c923ccf9626094555b4 (patch) | |
tree | 6780d9edcd83652da143aa25c1862f88f06eba88 /splash | |
parent | 90b1a404629a884cc32737a3a729c9a75f7a59c1 (diff) |
* poppler/ArthurOutputDev.cc
* splash/SplashFTFont.cc
* splash/SplashMath.h: Make it compile with --enable-fixedpoint. Fixes
bug 11110
Diffstat (limited to 'splash')
-rw-r--r-- | splash/SplashFTFont.cc | 8 | ||||
-rw-r--r-- | splash/SplashMath.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/splash/SplashFTFont.cc b/splash/SplashFTFont.cc index 3c7da792..963d42dc 100644 --- a/splash/SplashFTFont.cc +++ b/splash/SplashFTFont.cc @@ -127,10 +127,10 @@ SplashFTFont::SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA, matrix.yx = (FT_Fixed)((mat[1] / size).getRaw()); matrix.xy = (FT_Fixed)((mat[2] / size).getRaw()); matrix.yy = (FT_Fixed)((mat[3] / size).getRaw()); - textMatrix.xx = (FT_Fixed)((textMat[0] / (size * textScale)).getRaw()); - textMatrix.yx = (FT_Fixed)((textMat[1] / (size * textScale)).getRaw()); - textMatrix.xy = (FT_Fixed)((textMat[2] / (size * textScale)).getRaw()); - textMatrix.yy = (FT_Fixed)((textMat[3] / (size * textScale)).getRaw()); + textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)).getRaw()); + textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)).getRaw()); + textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)).getRaw()); + textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)).getRaw()); #else matrix.xx = (FT_Fixed)((mat[0] / size) * 65536); matrix.yx = (FT_Fixed)((mat[1] / size) * 65536); diff --git a/splash/SplashMath.h b/splash/SplashMath.h index 17d05cda..7a8c8e31 100644 --- a/splash/SplashMath.h +++ b/splash/SplashMath.h @@ -8,7 +8,7 @@ #define SPLASHMATH_H #if USE_FIXEDPOINT -#include "FixedPoint.h" +#include "goo/FixedPoint.h" #else #include <math.h> #endif |