summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2010-10-01 12:51:54 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2010-10-01 12:58:00 (GMT)
commitea8dd9d2dbd3345fbf76625c441d9832f758bf70 (patch)
treef109ef895f52d1d7b678c61a3fd51dad7debd122
parentc146652bfb336c084c39db7513e27540e456791e (diff)
downloadQt-ea8dd9d2dbd3345fbf76625c441d9832f758bf70.zip
Qt-ea8dd9d2dbd3345fbf76625c441d9832f758bf70.tar.gz
Qt-ea8dd9d2dbd3345fbf76625c441d9832f758bf70.tar.bz2
Fixed antialiased rendering error in raster engine due to wrong merge.
We should only add to rendered_spans once, before freeing the rasterizer memory pool. This fixes the tst_qpathclipper:clip2() auto-test failure on 32-bit linux. Reviewed-by: Kim
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 135ae00..9749244 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -4253,8 +4253,6 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
#endif
Q_CHECK_PTR(rasterPoolBase); // note: we just freed the old rasterPoolBase. I hope it's not fatal.
- rendered_spans += q_gray_rendered_spans(*grayRaster.data());
-
qt_ft_grays_raster.raster_done(*grayRaster.data());
qt_ft_grays_raster.raster_new(grayRaster.data());
qt_ft_grays_raster.raster_reset(*grayRaster.data(), rasterPoolBase, rasterPoolSize);