r17287 by malex - Ubuntu patch from 9850 for building on armel arch
scribus-commit
scribus-commit at lists.scribus.net
Fri Feb 10 03:20:54 UTC 2012
Author: malex
Date: Fri Feb 10 03:20:54 2012
New Revision: 17287
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17287
Log:
Ubuntu patch from 9850 for building on armel arch
Modified:
branches/Version14x/Scribus/scribus/fonts/scfontmetrics.cpp
branches/Version14x/Scribus/scribus/pageitem.cpp
branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
branches/Version14x/Scribus/scribus/pdflib_core.cpp
branches/Version14x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
branches/Version14x/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
branches/Version14x/Scribus/scribus/propertiespalette.cpp
branches/Version14x/Scribus/scribus/pslib.cpp
branches/Version14x/Scribus/scribus/scpageoutput.cpp
branches/Version14x/Scribus/scribus/scpainter.cpp
branches/Version14x/Scribus/scribus/scribusview.cpp
branches/Version14x/Scribus/scribus/selection.cpp
branches/Version14x/Scribus/scribus/smlinestyle.cpp
branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
Modified: branches/Version14x/Scribus/scribus/fonts/scfontmetrics.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/fonts/scfontmetrics.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/fonts/scfontmetrics.cpp (original)
+++ branches/Version14x/Scribus/scribus/fonts/scfontmetrics.cpp Fri Feb 10 03:20:54 2012
@@ -281,7 +281,7 @@
{
gly.translate(static_cast<qreal>(pen_x) / 6400.0, a);
gp = getMaxClipF(&gly);
- ymax = qMax(ymax, gp.y());
+ ymax = qMax(double(ymax), gp.y());
p->setupPolygon(&gly);
p->fillPath();
}
@@ -302,7 +302,7 @@
{
gly.translate(static_cast<qreal>(pen_x) / 6400.0, a);
gp = getMaxClipF(&gly);
- ymax = qMax(ymax, gp.y());
+ ymax = qMax(double(ymax), gp.y());
p->setupPolygon(&gly);
p->fillPath();
}
Modified: branches/Version14x/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem.cpp Fri Feb 10 03:20:54 2012
@@ -2038,12 +2038,12 @@
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 @@
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 @@
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 @@
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
Modified: branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_textframe.cpp Fri Feb 10 03:20:54 2012
@@ -525,7 +525,7 @@
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 @@
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);
}
}
Modified: branches/Version14x/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pdflib_core.cpp (original)
+++ branches/Version14x/Scribus/scribus/pdflib_core.cpp Fri Feb 10 03:20:54 2012
@@ -4418,12 +4418,12 @@
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 @@
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);
Modified: branches/Version14x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp Fri Feb 10 03:20:54 2012
@@ -723,12 +723,12 @@
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
{
Upos = 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)
Upos += (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0);
@@ -780,12 +780,12 @@
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
{
Upos = 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)
Upos += (charStyle.fontSize() / 10.0) * hl->glyph.scaleV * (charStyle.baselineOffset() / 1000.0);
@@ -970,12 +970,12 @@
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);
@@ -1046,12 +1046,12 @@
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);
Modified: branches/Version14x/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp Fri Feb 10 03:20:54 2012
@@ -115,7 +115,7 @@
currDoc = ScCore->primaryMainWindow()->doc;
if (currDoc->m_Selection->count() > 0)
{
- QVector<double> m_array;
+ QVector<qreal> m_array;
PageItem *currItem = currDoc->m_Selection->itemAt(0);
FPointArray path = currItem->PoLine;
QPainterPath pp;
Modified: branches/Version14x/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/propertiespalette.cpp (original)
+++ branches/Version14x/Scribus/scribus/propertiespalette.cpp Fri Feb 10 03:20:54 2012
@@ -107,7 +107,7 @@
const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color];
tmpf = ScColorEngine::getDisplayColor(col, item.m_doc, item.m_Line[its].Shade);
QPen pen;
- QVector<double> m_array;
+ QVector<qreal> m_array;
if (item.m_Line[its].Dash == 1)
pen.setStyle(Qt::SolidLine);
else
@@ -4618,7 +4618,7 @@
doc->setRedrawBounding(CurItem);
break;
default:
- CurItem->SetFrameShape(c, vals);
+ CurItem->SetFrameShape(c, (double*)vals);
doc->setRedrawBounding(CurItem);
CurItem->FrameType = f+2;
break;
Modified: branches/Version14x/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/pslib.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pslib.cpp (original)
+++ branches/Version14x/Scribus/scribus/pslib.cpp Fri Feb 10 03:20:54 2012
@@ -2840,12 +2840,12 @@
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);
@@ -2911,12 +2911,12 @@
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);
@@ -2988,12 +2988,12 @@
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);
@@ -3065,12 +3065,12 @@
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);
@@ -3789,12 +3789,12 @@
if (cstyle.underlineWidth() != -1)
lw = (cstyle.underlineWidth() / 1000.0) * (cstyle.fontSize() / 10.0);
else
- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0);
+ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0));
}
else
{
Upos = cstyle.font().underlinePos(cstyle.fontSize() / 10.0);
- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0);
+ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0));
}
if (cstyle.baselineOffset() != 0)
Upos += (cstyle.fontSize() / 10.0) * glyphs.scaleV * (cstyle.baselineOffset() / 1000.0);
@@ -3922,12 +3922,12 @@
if (cstyle.strikethruWidth() != -1)
lw = (cstyle.strikethruWidth() / 1000.0) * (cstyle.fontSize() / 10.0);
else
- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0);
+ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0));
}
else
{
Upos = cstyle.font().strikeoutPos(cstyle.fontSize() / 10.0);
- lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), 1.0);
+ lw = qMax(cstyle.font().strokeWidth(cstyle.fontSize() / 10.0), qreal(1.0));
}
if (cstyle.baselineOffset() != 0)
Upos += (cstyle.fontSize() / 10.0) * glyphs.scaleV * (cstyle.baselineOffset() / 1000.0);
Modified: branches/Version14x/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scpageoutput.cpp (original)
+++ branches/Version14x/Scribus/scribus/scpageoutput.cpp Fri Feb 10 03:20:54 2012
@@ -551,12 +551,12 @@
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);
@@ -638,12 +638,12 @@
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);
Modified: branches/Version14x/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/scpainter.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scpainter.cpp (original)
+++ branches/Version14x/Scribus/scribus/scpainter.cpp Fri Feb 10 03:20:54 2012
@@ -941,7 +941,7 @@
cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_WINDING);
if (fillMode == 1)
{
- double r, g, b;
+ qreal r, g, b;
m_fill.getRgbF(&r, &g, &b);
cairo_set_source_rgba( m_cr, r, g, b, fill_trans );
// if (fill_trans != 1.0)
@@ -979,7 +979,7 @@
vneu = 255 - ((255 - v) * shad / 100);
qStopColor.setHsv(h, sneu, vneu);
double a = colorStops[offset]->opacity;
- double r, g, b;
+ qreal r, g, b;
qStopColor.getRgbF(&r, &g, &b);
cairo_pattern_add_color_stop_rgba (pat, rampPoint, r, g, b, a);
lastPoint = rampPoint;
@@ -1024,7 +1024,7 @@
cairo_set_dash( m_cr, m_array.data(), m_array.count(), m_offset);
else
cairo_set_dash( m_cr, NULL, 0, 0 );
- double r, g, b;
+ qreal r, g, b;
m_stroke.getRgbF(&r, &g, &b);
cairo_set_source_rgba( m_cr, r, g, b, stroke_trans );
// if (stroke_trans != 1.0)
@@ -1348,7 +1348,7 @@
double y;
double ww = 0;
double hh = 0;
- double r, g, b;
+ qreal r, g, b;
cairo_select_font_face(m_cr, m_font.family().toLatin1(), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
cairo_set_font_size(m_cr, m_font.pointSizeF());
cairo_font_extents (m_cr, &extentsF);
Modified: branches/Version14x/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/scribusview.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusview.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusview.cpp Fri Feb 10 03:20:54 2012
@@ -4153,12 +4153,12 @@
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 @@
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 @@
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 @@
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);
Modified: branches/Version14x/Scribus/scribus/selection.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/selection.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/selection.cpp (original)
+++ branches/Version14x/Scribus/scribus/selection.cpp Fri Feb 10 03:20:54 2012
@@ -517,10 +517,10 @@
QRectF itRect(currItem->getVisualBoundingRect());
// for (uint pc = 0; pc < 4; ++pc)
{
- vminx = qMin(vminx, itRect.x());
- vminy = qMin(vminy, itRect.y());
- vmaxx = qMax(vmaxx, itRect.right());
- vmaxy = qMax(vmaxy, itRect.bottom());
+ vminx = qMin(vminx, (double)itRect.x());
+ vminy = qMin(vminy, (double)itRect.y());
+ vmaxx = qMax(vmaxx, (double)itRect.right());
+ vmaxy = qMax(vmaxy, (double)itRect.bottom());
}
}
else
Modified: branches/Version14x/Scribus/scribus/smlinestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/smlinestyle.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/smlinestyle.cpp (original)
+++ branches/Version14x/Scribus/scribus/smlinestyle.cpp Fri Feb 10 03:20:54 2012
@@ -734,7 +734,7 @@
for (int it = (*tmpLine).size()-1; it > -1; it--)
{
QPen pen;
- QVector<double> m_array;
+ QVector<qreal> m_array;
if ((*tmpLine)[it].Dash == 1)
pen.setStyle(Qt::SolidLine);
else
Modified: branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17287&path=/branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp (original)
+++ branches/Version14x/Scribus/scribus/ui/modetoolbar.cpp Fri Feb 10 03:20:54 2012
@@ -101,7 +101,7 @@
// insertShapeButtonMenu->hide();
SubMode = s;
ValCount = c;
- ShapeVals = vals;
+ ShapeVals = (double*)vals;
m_ScMW->scrActions["toolsInsertShape"]->setChecked(false);
m_ScMW->scrActions["toolsInsertShape"]->setChecked(true);
}
More information about the scribus-commit
mailing list