diff options
| -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()) |