summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-29 12:50:26 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-29 12:50:26 +0200
commitedc78eca750953ad08ad67cddde92d2f977de2a8 (patch)
treee847c9287e6d6b6b05eb8d5c5a8b55c1a1aa757d /src/plugins
parent46a269e8ab27bef04822de7e36041ce7109f626c (diff)
parent85e621e3ecf449bb0587bd4da97ca66179b24f31 (diff)
Merge remote-tracking branch 'origin/5.3' into dev
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/imageformats/dds/qddshandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp
index 13bb9aa..d5c8793 100644
--- a/src/plugins/imageformats/dds/qddshandler.cpp
+++ b/src/plugins/imageformats/dds/qddshandler.cpp
@@ -1338,9 +1338,9 @@ bool QDDSHandler::write(const QImage &outImage)
dds.pixelFormat.bBitMask = 0x000000ff;
s << dds;
- for (int width = 0; width < image.width(); width++) {
- for (int height = 0; height < image.height(); height++) {
- QRgb pixel = image.pixel(height, width);;
+ for (int height = 0; height < image.height(); height++) {
+ for (int width = 0; width < image.width(); width++) {
+ QRgb pixel = image.pixel(width, height);
quint32 color;
quint8 alpha = qAlpha(pixel);
quint8 red = qRed(pixel);