diff options
| author | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-10 03:20:54 +0000 |
|---|---|---|
| committer | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-10 03:20:54 +0000 |
| commit | 0a3229cf1860de8f59f5f59a3d0b3c563ea13df8 (patch) | |
| tree | 738a12992d2ec9794035adab2195d4a9425aa27f /scribus/fonts/scfontmetrics.cpp | |
| parent | cee06e59c897fd7b66365c838248b394e047098e (diff) | |
| download | scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.tar.gz scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.tar.xz scribus-0a3229cf1860de8f59f5f59a3d0b3c563ea13df8.zip | |
Ubuntu patch from 9850 for building on armel arch
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17287 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/fonts/scfontmetrics.cpp')
| -rw-r--r-- | scribus/fonts/scfontmetrics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scribus/fonts/scfontmetrics.cpp b/scribus/fonts/scfontmetrics.cpp index 8706361..391ef54 100644 --- a/scribus/fonts/scfontmetrics.cpp +++ b/scribus/fonts/scfontmetrics.cpp @@ -281,7 +281,7 @@ QPixmap FontSample(const ScFace& fnt, int s, QString ts, QColor back, bool force { gly.translate(static_cast<qreal>(pen_x) / 6400.0, a); gp = getMaxClipF(&gly); - ymax = qMax(ymax, gp.y()); + ymax = qMax(double(ymax), gp.y()); p->setupPolygon(&gly); p->fillPath(); } @@ -302,7 +302,7 @@ QPixmap FontSample(const ScFace& fnt, int s, QString ts, QColor back, bool force { gly.translate(static_cast<qreal>(pen_x) / 6400.0, a); gp = getMaxClipF(&gly); - ymax = qMax(ymax, gp.y()); + ymax = qMax(double(ymax), gp.y()); p->setupPolygon(&gly); p->fillPath(); } |