diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-18 16:39:32 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-20 13:08:50 +0200 |
commit | 665d8a045455214d2cfca72076da6bc75d3058c7 (patch) | |
tree | 4f403941eb95b5680394a8504a89f092060081d5 /src/gui/painting | |
parent | 0da3d7d5d34f86b7826045bd557f8733b7da5073 (diff) |
Make QPoint have the same layout on all platforms
Change-Id: I8330295761a4440afd81c121039237fb651d9a9c
Reviewed-on: http://codereview.qt.nokia.com/487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 7 | ||||
-rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 0a1b8bbd01..e2ce35af64 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -2006,15 +2006,8 @@ void QRasterPaintEngine::drawPolygon(const QPoint *points, int pointCount, Polyg if (s->penData.blend) { int count = pointCount * 2; QVarLengthArray<qreal> fpoints(count); - #ifdef Q_WS_MAC - for (int i=0; i<count; i+=2) { - fpoints[i] = ((int *) points)[i+1]; - fpoints[i+1] = ((int *) points)[i]; - } - #else for (int i=0; i<count; ++i) fpoints[i] = ((int *) points)[i]; - #endif QVectorPath vp((qreal *) fpoints.data(), pointCount, 0, QVectorPath::polygonFlags(mode)); if (s->flags.fast_pen) { diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 5105d9a963..9427dd5105 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -789,15 +789,8 @@ void QPaintEngineEx::drawLines(const QLine *lines, int lineCount) qreal pts[64]; int count2 = count<<1; -#ifdef Q_WS_MAC - for (int i=0; i<count2; i+=2) { - pts[i] = ((int *) lines)[i+1]; - pts[i+1] = ((int *) lines)[i]; - } -#else for (int i=0; i<count2; ++i) pts[i] = ((int *) lines)[i]; -#endif QVectorPath path(pts, count, qpaintengineex_line_types_16, QVectorPath::LinesHint); stroke(path, state()->pen); |