diff options
| author | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-14 22:12:22 +0000 |
|---|---|---|
| committer | malex <malex@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-14 22:12:22 +0000 |
| commit | 14d21cfb22880a2cefa966fd2b43e53707ffd79a (patch) | |
| tree | bde7255cde1848e5f8aad7b4c231373302229507 /scribus | |
| parent | 36cc68da9692f09836000184c989f518b1e86752 (diff) | |
| download | scribus-14d21cfb22880a2cefa966fd2b43e53707ffd79a.tar.gz scribus-14d21cfb22880a2cefa966fd2b43e53707ffd79a.tar.xz scribus-14d21cfb22880a2cefa966fd2b43e53707ffd79a.zip | |
2 more fixes for the armel build failures
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17299 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus')
| -rw-r--r-- | scribus/pageitem_textframe.cpp | 2 | ||||
| -rw-r--r-- | scribus/scribusview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp index fb7c07b..b5b0378 100644 --- a/scribus/pageitem_textframe.cpp +++ b/scribus/pageitem_textframe.cpp @@ -554,7 +554,7 @@ struct LineControl { double maxX = colRight - morespace; if (legacy) maxX -= lineCorr; - double StartX = floor(qMax(line.x, qMin(maxX,breakXPos-maxShrink-1))-1); + double StartX = floor(qMax((double)line.x, qMin(maxX,breakXPos-maxShrink-1))-1); int xPos = static_cast<int>(ceil(maxX)); QPoint pt12 (xPos, yAsc); diff --git a/scribus/scribusview.cpp b/scribus/scribusview.cpp index 2e936c6..c6107f0 100644 --- a/scribus/scribusview.cpp +++ b/scribus/scribusview.cpp @@ -1712,7 +1712,7 @@ bool ScribusView::slotSetCurs(int x, int y) if (transform.isInvertible() && currItem->itemText.length() > 0) { double tx = 0, ty = 0; - transform.inverted().map(pf.x(), pf.y(), &tx, &ty); + transform.inverted().map(qreal(pf.x()), qreal(pf.y()), (qreal*)&tx, (qreal*)&ty); point.setXY(tx, ty); } if (currItem->reversed()) |