summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2010-01-15 12:23:51 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-01-28 15:43:00 (GMT)
commitb8c10ae3ef42d7895412a985d746a862e1dfb36c (patch)
tree2241591c67b9f2514ef67df85852640496665163
parentce227e377510e2c47be0ada505bf97125beffec2 (diff)
downloadQt-b8c10ae3ef42d7895412a985d746a862e1dfb36c.zip
Qt-b8c10ae3ef42d7895412a985d746a862e1dfb36c.tar.gz
Qt-b8c10ae3ef42d7895412a985d746a862e1dfb36c.tar.bz2
Small optimization in raster paint engine.
Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
-rw-r--r--src/gui/painting/qpaintengine_raster_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index b937f66..a1c73cc 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -264,13 +264,13 @@ private:
#endif // Q_OS_SYMBIAN && QT_NO_FREETYPE
inline void ensureBrush(const QBrush &brush) {
- if (!qbrush_fast_equals(state()->lastBrush, brush) || state()->fillFlags)
+ if (!qbrush_fast_equals(state()->lastBrush, brush) || (brush.style() != Qt::NoBrush && state()->fillFlags))
updateBrush(brush);
}
inline void ensureBrush() { ensureBrush(state()->brush); }
inline void ensurePen(const QPen &pen) {
- if (!qpen_fast_equals(state()->lastPen, pen) || state()->strokeFlags)
+ if (!qpen_fast_equals(state()->lastPen, pen) || (pen.style() != Qt::NoPen && state()->strokeFlags))
updatePen(pen);
}
inline void ensurePen() { ensurePen(state()->pen); }