diff options
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qpainter/tst_qpainter.cpp | 32 |
2 files changed, 34 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 975ebb0..c03f82b 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4811,6 +4811,7 @@ public: for (int i = 0; i < stops.size() && i <= 2; i++) hash_val += stops[i].second.rgba(); + QMutexLocker lock(&mutex); QGradientColorTableHash::const_iterator it = cache.constFind(hash_val); if (it == cache.constEnd()) @@ -4844,6 +4845,7 @@ protected: } QGradientColorTableHash cache; + QMutex mutex; }; void QGradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, int opacity) const diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index beb83a1..4146c5e 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -251,6 +251,8 @@ private slots: void QTBUG5939_attachPainterPrivate(); + void QTBUG14614_gradientCacheRaceCondition(); + private: void fillData(); void setPenColor(QPainter& p); @@ -4458,6 +4460,36 @@ void tst_QPainter::QTBUG5939_attachPainterPrivate() QCOMPARE(widget->deviceTransform, proxy->deviceTransform); } +class GradientProducer : public QThread +{ +protected: + void run(); +}; + +void GradientProducer::run() +{ + QImage image(1, 1, QImage::Format_RGB32); + QPainter p(&image); + + for (int i = 0; i < 1000; ++i) { + QLinearGradient g; + g.setColorAt(0, QColor(i % 256, 0, 0)); + g.setColorAt(1, Qt::white); + + p.fillRect(image.rect(), g); + } +} + +void tst_QPainter::QTBUG14614_gradientCacheRaceCondition() +{ + const int threadCount = 16; + GradientProducer producers[threadCount]; + for (int i = 0; i < threadCount; ++i) + producers[i].start(); + for (int i = 0; i < threadCount; ++i) + producers[i].wait(); +} + QTEST_MAIN(tst_QPainter) #include "tst_qpainter.moc" |