diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
| commit | 5422e929cad04633a06c156cba96cfcd69262522 (patch) | |
| tree | afb3c9b76c05d80238a1ff76f4e8f4019fac1651 /src/gui/image | |
| parent | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff) | |
| parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) | |
| download | Qt-5422e929cad04633a06c156cba96cfcd69262522.zip Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/network/bearer/bearer.pri
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qgifhandler.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp index 4dd4743..7cb7373 100644 --- a/src/gui/image/qgifhandler.cpp +++ b/src/gui/image/qgifhandler.cpp @@ -1046,7 +1046,7 @@ QGifHandler::QGifHandler() { gifFormat = new QGIFFormat; nextDelay = 100; - loopCnt = 1; + loopCnt = -1; frameNumber = -1; scanIsCached = false; } @@ -1192,7 +1192,13 @@ int QGifHandler::loopCount() const QGIFFormat::scan(device(), &imageSizes, &loopCnt); scanIsCached = true; } - return loopCnt-1; // In GIF, loop count is iteration count, so subtract one + + if (loopCnt == 0) + return -1; + else if (loopCnt == -1) + return 0; + else + return loopCnt; } int QGifHandler::currentImageNumber() const |