diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-07 08:31:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-07 09:38:34 +0000 |
| commit | 191a21047863cd327d3e8102b08dbf20a4c6e0a5 (patch) | |
| tree | 9be92e3111992951d87571ebbcf1e2859901050f /src/gui/image/qimagereader.cpp | |
| parent | dea78262e52da38de47301e206459967aa6719bb (diff) | |
| parent | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/image/qimagereader.cpp')
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 55c3a4704a..cd7c95b166 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -471,7 +471,8 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, --numFormats; ++currentFormat; - currentFormat %= _qt_NumFormats; + if (currentFormat >= _qt_NumFormats) + currentFormat = 0; } } |