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.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.cpp')
| -rw-r--r-- | scribus/pageitem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scribus/pageitem.cpp b/scribus/pageitem.cpp index 4a05a2d..56a6451 100644 --- a/scribus/pageitem.cpp +++ b/scribus/pageitem.cpp @@ -2038,12 +2038,12 @@ void PageItem::drawGlyphs(ScPainter *p, const CharStyle& style, GlyphLayout& gly if (style.underlineWidth() != -1) lw = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); else - lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); } else { st = style.font().underlinePos(style.fontSize() / 10.0); - lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); } if (style.baselineOffset() != 0) st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); @@ -2156,12 +2156,12 @@ void PageItem::drawGlyphs(ScPainter *p, const CharStyle& style, GlyphLayout& gly if (style.strikethruWidth() != -1) lw = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); else - lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); } else { st = style.font().strikeoutPos(style.fontSize() / 10.0); - lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + lw = qMax(style.font().strokeWidth(style.fontSize() / 10.0), qreal(1.0)); } if (style.baselineOffset() != 0) st += (style.fontSize() / 10.0) * glyphs.scaleV * (style.baselineOffset() / 1000.0); @@ -4829,7 +4829,7 @@ void PageItem::getBoundingRect(double *x1, double *y1, double *x2, double *y2) c FPoint maxAr = getMaxClipF(&arrow); totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y()))); } - totalRect.getCoords(x1, y1, x2, y2); + totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2); } void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const @@ -4989,7 +4989,7 @@ void PageItem::getVisualBoundingRect(double * x1, double * y1, double * x2, doub FPoint maxAr = getMaxClipF(&arrow); totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y()))); } - totalRect.getCoords(x1, y1, x2, y2); + totalRect.getCoords((qreal*)x1, (qreal*)y1, (qreal*)x2, (qreal*)y2); } double PageItem::visualXPos() const |