From c5458bc2ce5c3671c9fffa41573f1daa630dd324 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 8 Dec 2021 05:46:33 +0200 Subject: [PATCH] effectively revert 658697932172536537e6a22e883d78572f7e96bf Signed-off-by: Ivailo Monev --- src/gui/painting/qbrush.cpp | 4 ++-- src/gui/painting/qpaintengine_raster.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index df6fd2453..466a4518a 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -61,9 +61,9 @@ QPixmap qt_pixmapForBrush(int brushStyle) return QBitmap::fromData(QSize(8, 8), qt_patternForBrush(brushStyle), QImage::Format_MonoLSB); } -Q_GUI_EXPORT QImage qt_diagCrossBrush() +Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle) { - return QImage(qt_patternForBrush(Qt::DiagCrossPattern), 8, 8, 1, QImage::Format_MonoLSB); + return QImage(qt_patternForBrush(brushStyle), 8, 8, 1, QImage::Format_MonoLSB); } diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 3a1817e57..7c32e3b22 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3197,7 +3197,7 @@ void QSpanData::init(QRasterBuffer *rb, const QRasterPaintEngine *pe) clip = pe ? pe->d_func()->clip() : 0; } -Q_GUI_EXPORT extern QImage qt_diagCrossBrush(); +Q_GUI_EXPORT extern QImage qt_imageForBrush(int brushStyle); void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode compositionMode) { @@ -3286,7 +3286,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode type = Texture; if (!tempImage) tempImage = new QImage(); - *tempImage = rasterBuffer->colorizeBitmap(qt_diagCrossBrush(), brush.color()); + *tempImage = rasterBuffer->colorizeBitmap(qt_imageForBrush(brushStyle), brush.color()); initTexture(tempImage, alpha, QTextureData::Tiled); break; case Qt::TexturePattern: -- 2.11.0