diff options
| author | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
| commit | cda84350a3e38d7a35e6341720e3e353803b8dea (patch) | |
| tree | 240ba38d683ad1256ca7ddd54f51bf6f21962056 /src/gui/painting/qpaintengine_raster.cpp | |
| parent | e5098123c12880d922923d1117f7b82995c6b5a0 (diff) | |
| parent | 4673878256262802c07303fce1e1f8cc1b7e652b (diff) | |
| download | Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.zip Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.gz Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.bz2 | |
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index bcc5f9d..0fea2da 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1649,8 +1649,8 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) if (lines[i].p1() == lines[i].p2()) { if (s->lastPen.capStyle() != Qt::FlatCap) { QPointF p = lines[i].p1(); - QLineF line = s->matrix.map(QLineF(QPointF(p.x() - width*0.5, p.y()), - QPointF(p.x() + width*0.5, p.y()))); + QLineF line = s->matrix.map(QLineF(QPointF(p.x() - width*qreal(0.5), p.y()), + QPointF(p.x() + width*qreal(0.5), p.y()))); d->rasterizer->rasterizeLine(line.p1(), line.p2(), 1); } continue; @@ -5117,7 +5117,7 @@ static void drawEllipse_midpoint_i(const QRect &rect, const QRect &clip, { const qreal a = qreal(rect.width()) / 2; const qreal b = qreal(rect.height()) / 2; - qreal d = b*b - (a*a*b) + 0.25*a*a; + qreal d = b*b - (a*a*b) + qreal(0.25)*a*a; int x = 0; int y = (rect.height() + 1) / 2; @@ -5140,7 +5140,7 @@ static void drawEllipse_midpoint_i(const QRect &rect, const QRect &clip, pen_func, brush_func, pen_data, brush_data); // region 2 - d = b*b*(x + 0.5)*(x + 0.5) + a*a*((y - 1)*(y - 1) - b*b); + d = b*b*(x + qreal(0.5))*(x + qreal(0.5)) + a*a*((y - 1)*(y - 1) - b*b); const int miny = rect.height() & 0x1; while (y > miny) { if (d < 0) { // select SE |