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/pageitem_textframe.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/pageitem_textframe.cpp')
| -rw-r--r-- | scribus/pageitem_textframe.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp index 6482755..fb7c07b 100644 --- a/scribus/pageitem_textframe.cpp +++ b/scribus/pageitem_textframe.cpp @@ -525,7 +525,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); @@ -729,8 +729,8 @@ struct LineControl { desc = cStyle.font().realCharDescent(ch, cStyle.fontSize() / 10.0) * scaleV - offset; } // qDebug() << QString("checking char 'x%2' with ascender %1 > %3").arg(asce).arg(ch.unicode()).arg(result); - line.ascent = qMax(line.ascent, asce); - line.descent = qMax(line.descent, desc); + line.ascent = qMax((double)line.ascent, asce); + line.descent = qMax((double)line.descent, desc); } } |