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/scribusview.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/scribusview.cpp')
| -rw-r--r-- | scribus/scribusview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scribus/scribusview.cpp b/scribus/scribusview.cpp index 40a59b5..2e936c6 100644 --- a/scribus/scribusview.cpp +++ b/scribus/scribusview.cpp @@ -4153,12 +4153,12 @@ void ScribusView::TextToPath() if (charStyle.underlineWidth() != -1) Uwid = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); else - Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } else { Upos = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); - Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } if (charStyle.baselineOffset() != 0) Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); @@ -4293,12 +4293,12 @@ void ScribusView::TextToPath() if (charStyle.strikethruWidth() != -1) Uwid = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); else - Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } else { Upos = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); - Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + Uwid = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } if (charStyle.baselineOffset() != 0) Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0); @@ -4383,12 +4383,12 @@ void ScribusView::TextToPath() if (charStyle.underlineWidth() != -1) lw = (charStyle.underlineWidth() / 1000.0) * (charStyle.fontSize() / 10.0); else - lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } else { st = charStyle.font().underlinePos(charStyle.fontSize() / 10.0); - lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } if (charStyle.baselineOffset() != 0) st += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0); @@ -4567,12 +4567,12 @@ void ScribusView::TextToPath() if (charStyle.strikethruWidth() != -1) lw = (charStyle.strikethruWidth() / 1000.0) * (charStyle.fontSize() / 10.0); else - lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } else { st = charStyle.font().strikeoutPos(charStyle.fontSize() / 10.0); - lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), 1.0); + lw = qMax(charStyle.font().strokeWidth(charStyle.fontSize() / 10.0), (qreal)1.0); } if (charStyle.baselineOffset() != 0) st += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0); |