diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
| commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
| tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp | |
| parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp')
| -rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp index 8f59afa759..48717e34f6 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp @@ -48,17 +48,17 @@ ** ****************************************************************************/ +#include "extrafiltersplugin.h" + #include <QtWidgets> #include <math.h> #include <stdlib.h> -#include "extrafiltersplugin.h" - QStringList ExtraFiltersPlugin::filters() const { - return QStringList() << tr("Flip Horizontally") << tr("Flip Vertically") - << tr("Smudge...") << tr("Threshold..."); + return {tr("Flip Horizontally"), tr("Flip Vertically"), + tr("Smudge..."), tr("Threshold...")}; } QImage ExtraFiltersPlugin::filterImage(const QString &filter, @@ -70,14 +70,14 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter, if (filter == tr("Flip Horizontally")) { for (int y = 0; y < original.height(); ++y) { for (int x = 0; x < original.width(); ++x) { - int pixel = original.pixel(original.width() - x - 1, y); + QRgb pixel = original.pixel(original.width() - x - 1, y); result.setPixel(x, y, pixel); } } } else if (filter == tr("Flip Vertically")) { for (int y = 0; y < original.height(); ++y) { for (int x = 0; x < original.width(); ++x) { - int pixel = original.pixel(x, original.height() - y - 1); + QRgb pixel = original.pixel(x, original.height() - y - 1); result.setPixel(x, y, pixel); } } @@ -90,11 +90,11 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter, for (int i = 0; i < numIters; ++i) { for (int y = 1; y < original.height() - 1; ++y) { for (int x = 1; x < original.width() - 1; ++x) { - int p1 = original.pixel(x, y); - int p2 = original.pixel(x, y + 1); - int p3 = original.pixel(x, y - 1); - int p4 = original.pixel(x + 1, y); - int p5 = original.pixel(x - 1, y); + QRgb p1 = original.pixel(x, y); + QRgb p2 = original.pixel(x, y + 1); + QRgb p3 = original.pixel(x, y - 1); + QRgb p4 = original.pixel(x + 1, y); + QRgb p5 = original.pixel(x - 1, y); int red = (qRed(p1) + qRed(p2) + qRed(p3) + qRed(p4) + qRed(p5)) / 5; @@ -119,7 +119,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter, int factor = 256 / threshold; for (int y = 0; y < original.height(); ++y) { for (int x = 0; x < original.width(); ++x) { - int pixel = original.pixel(x, y); + QRgb pixel = original.pixel(x, y); result.setPixel(x, y, qRgba(qRed(pixel) / factor * factor, qGreen(pixel) / factor * factor, qBlue(pixel) / factor * factor, |