Commit cdf70857 authored by Albert Astals Cid's avatar Albert Astals Cid

* poppler/ArthurOutputDev.cc

        * splash/SplashFTFont.cc
        * splash/SplashMath.h: Make it compile with --enable-fixedpoint. Fixes
        bug 11110
parent 90b1a404
2007-06-01 Albert Astals Cid <aacid@kde.org>
* poppler/ArthurOutputDev.cc
* splash/SplashFTFont.cc
* splash/SplashMath.h: Make it compile with --enable-fixedpoint. Fixes
bug 11110
2007-05-30 Albert Astals Cid <aacid@kde.org>
* configure.ac: Fix to check for glib-2.0 not glib that is 1.0. Patch
......
......@@ -510,10 +510,10 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
qPath.setFillRule(Qt::WindingFill);
for (int i = 0; i < fontPath->length; ++i) {
if (fontPath->flags[i] & splashPathFirst) {
qPath.moveTo(x0+fontPath->pts[i].x, y0+fontPath->pts[i].y);
qPath.moveTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0);
} else if (fontPath->flags[i] & splashPathCurve) {
qPath.quadTo(x0+fontPath->pts[i].x, y0+fontPath->pts[i].y,
x0+fontPath->pts[i+1].x, y0+fontPath->pts[i+1].y);
qPath.quadTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0,
fontPath->pts[i+1].x+x0, fontPath->pts[i+1].y+y0);
++i;
}
#warning FIX THIS
......@@ -521,7 +521,7 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
// qDebug() << "Need to implement arc";
// }
else {
qPath.lineTo(x0+fontPath->pts[i].x, y0+fontPath->pts[i].y);
qPath.lineTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0);
}
if (fontPath->flags[i] & splashPathLast) {
qPath.closeSubpath();
......
......@@ -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);
......
......@@ -8,7 +8,7 @@
#define SPLASHMATH_H
#if USE_FIXEDPOINT
#include "FixedPoint.h"
#include "goo/FixedPoint.h"
#else
#include <math.h>
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment