diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 05:38:54 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 05:38:54 (GMT) |
| commit | 37d71b2653b9f31ee73fdd09b0d2be757d4537bd (patch) | |
| tree | 5877aa8f77e34db7ab6d9c58180d32952c65b49c /src/plugins/imageformats/gif | |
| parent | eaa981c943293bf346a041aa4ad3d254e99ebd78 (diff) | |
| parent | dd2be9c7e7540870ddc532f02bd83860273cbbd6 (diff) | |
| download | Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.zip Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.tar.gz Qt-37d71b2653b9f31ee73fdd09b0d2be757d4537bd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'src/plugins/imageformats/gif')
| -rw-r--r-- | src/plugins/imageformats/gif/qgifhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index 8abc2d1..2da822d 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -1026,7 +1026,7 @@ inline QRgb QGIFFormat::color(uchar index) const QGifHandler::QGifHandler() { gifFormat = new QGIFFormat; - nextDelay = 0; + nextDelay = 100; loopCnt = 1; frameNumber = -1; scanIsCached = false; @@ -1061,7 +1061,7 @@ bool QGifHandler::imageIsComing() const bool QGifHandler::canRead() const { - if (!nextDelay && canRead(device())) { + if (canRead(device())) { setFormat("gif"); return true; } |