diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-08-18 15:06:19 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-08-18 15:06:19 (GMT) |
| commit | 3014b427aa8700890f9bd8ea2a0300fc152bf3d2 (patch) | |
| tree | 5f7a662ccfe9fb24c1bc8aef543df0eb47366177 | |
| parent | 9ab7a8512957465d16c24e86ad3d90f14ce037bc (diff) | |
| download | Qt-3014b427aa8700890f9bd8ea2a0300fc152bf3d2.zip Qt-3014b427aa8700890f9bd8ea2a0300fc152bf3d2.tar.gz Qt-3014b427aa8700890f9bd8ea2a0300fc152bf3d2.tar.bz2 | |
Revert "Outline / fill inconsistency in X11 paint engine."
This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443.
Reviewed-by: Trond
| -rw-r--r-- | src/gui/painting/qpaintengine_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index 5307142..e521e01 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -1516,8 +1516,8 @@ void QX11PaintEnginePrivate::fillPolygon_translated(const QPointF *polygonPoints for (int i = 0; i < pointCount; ++i) { translated_points[i] = polygonPoints[i] + offset; - translated_points[i].rx() = qFloor(translated_points[i].x()) + offs; - translated_points[i].ry() = qFloor(translated_points[i].y()) + offs; + translated_points[i].rx() = qRound(translated_points[i].x()) + offs; + translated_points[i].ry() = qRound(translated_points[i].y()) + offs; } fillPolygon_dev(translated_points.data(), pointCount, gcMode, mode); @@ -1754,8 +1754,8 @@ void QX11PaintEnginePrivate::fillPath(const QPainterPath &path, QX11PaintEngineP for (int j = 0; j < polys.at(i).size(); ++j) { translated_points[j] = polys.at(i).at(j); if (!X11->use_xrender || !(render_hints & QPainter::Antialiasing)) { - translated_points[j].rx() = qFloor(translated_points[j].rx() + aliasedCoordinateDelta) + offs; - translated_points[j].ry() = qFloor(translated_points[j].ry() + aliasedCoordinateDelta) + offs; + translated_points[j].rx() = qRound(translated_points[j].rx() + aliasedCoordinateDelta) + offs; + translated_points[j].ry() = qRound(translated_points[j].ry() + aliasedCoordinateDelta) + offs; } } |