diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-12-02 09:13:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-02 13:19:08 +0100 |
| commit | 6184491e21218c8fe6122f6d8254d5a306fc38b7 (patch) | |
| tree | 87a17680e66d0cc590c19d8ea461e969250b29e8 | |
| parent | 65fa7497f2561d30a3e82668f9fc29fa6f789a8d (diff) | |
Fix MSVC warnings about scopes.
qddshandler.cpp(483) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
qddshandler.cpp(477) : definition of 'i' ignored
qddshandler.cpp(467) : definition of 'i' used
qddshandler.cpp(486) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
qddshandler.cpp(477) : definition of 'i' ignored
qddshandler.cpp(467) : definition of 'i' used
Change-Id: Ib911578900f012db20d9e50bdffa5d1ca9896a7e
Reviewed-by: Ivan Komissarov <ABBAPOH@me.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index 01a8782..efe435d 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -474,9 +474,9 @@ static QImage readATI2(QDataStream &s, quint32 width, quint32 height) QRgb arr[16]; memset(arr, 0, sizeof(QRgb) * 16); setAlphaDXT<Five>(arr, alpha1); - for (int i = 0; i < 16; ++i) { - quint8 a = qAlpha(arr[i]); - arr[i] = qRgba(0, 0, a, 0); + for (int k = 0; k < 16; ++k) { + quint8 a = qAlpha(arr[k]); + arr[k] = qRgba(0, 0, a, 0); } setAlphaDXT<Five>(arr, alpha2); |