From 0a3229cf1860de8f59f5f59a3d0b3c563ea13df8 Mon Sep 17 00:00:00 2001 From: malex Date: Fri, 10 Feb 2012 03:20:54 +0000 Subject: Ubuntu patch from 9850 for building on armel arch git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17287 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/pdflib_core.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scribus/pdflib_core.cpp') diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp index ab0bb02..f781812 100644 --- a/scribus/pdflib_core.cpp +++ b/scribus/pdflib_core.cpp @@ -4418,12 +4418,12 @@ bool PDFLibCore::setTextCh(PageItem *ite, uint PNr, double x, double y, uint d, if (style.underlineWidth() != -1) Uwid = (style.underlineWidth() / 1000.0) * (style.fontSize() / 10.0); else - Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); } else { Upos = style.font().underlinePos(style.fontSize() / 10.0); - Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); } if (style.baselineOffset() != 0) Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); @@ -4698,12 +4698,12 @@ bool PDFLibCore::setTextCh(PageItem *ite, uint PNr, double x, double y, uint d, if (style.strikethruWidth() != -1) Uwid = (style.strikethruWidth() / 1000.0) * (style.fontSize() / 10.0); else - Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); } else { Upos = style.font().strikeoutPos(style.fontSize() / 10.0); - Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), 1.0); + Uwid = qMax(style.font().strokeWidth(style.fontSize() / 10.0), (qreal)1.0); } if (style.baselineOffset() != 0) Upos += (style.fontSize() / 10.0) * hl->glyph.scaleV * (style.baselineOffset() / 1000.0); -- cgit