From 30175b3586d92b11bc0acef85ec577cb43ef9bac Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 5 Apr 2020 00:55:33 +0000 Subject: [PATCH] get rid of qt_grayscale() argument Signed-off-by: Ivailo Monev --- src/gui/image/qpixmapfilter.cpp | 11 +++++------ src/gui/styles/qcommonstyle.cpp | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 76a660280..ba978933a 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -624,14 +624,13 @@ void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap // grayscales the image to dest (could be same). If rect isn't defined // destination image size is used to determine the dimension of grayscaling // process. -Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest, const QRect& rect = QRect()) +Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest) { - QRect destRect = rect; - QRect srcRect = rect; - if (rect.isNull()) { + QRect srcRect = image.rect(); + if (srcRect.isNull()) { srcRect = dest.rect(); - destRect = dest.rect(); } + QRect destRect = srcRect; if (&image != &dest) { destRect.moveTo(QPoint(0, 0)); } @@ -787,7 +786,7 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q // do colorizing QPainter destPainter(&destImage); - qt_grayscale(srcImage, destImage, srcImage.rect()); + qt_grayscale(srcImage, destImage); destPainter.setCompositionMode(QPainter::CompositionMode_Screen); destPainter.fillRect(srcImage.rect(), d->color); destPainter.end(); diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 017700ce7..625b6a439 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -5630,7 +5630,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardicon, const QStyleOption } // in qpixmapfilter.cpp -extern Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest, const QRect& rect); +extern Q_GUI_EXPORT void qt_grayscale(const QImage &image, QImage &dest); /*! \reimp */ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, @@ -5639,7 +5639,7 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p switch (iconMode) { case QIcon::Disabled: { QImage im = pixmap.toImage(); - qt_grayscale(im, im, im.rect()); + qt_grayscale(im, im); return QPixmap::fromImage(im); } case QIcon::Selected: { -- 2.11.0