diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-06-15 11:06:19 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-06-15 12:33:51 (GMT) |
| commit | df55141aa260c8a10c06aa990b6f20d6fb4718f3 (patch) | |
| tree | 90b6e5c168b83232187ce61cc4e5ffbf530d6118 /src/plugins/imageformats/mng | |
| parent | c28efecdcfdd5fa0049bf482cb102814338c0d99 (diff) | |
| download | Qt-df55141aa260c8a10c06aa990b6f20d6fb4718f3.zip Qt-df55141aa260c8a10c06aa990b6f20d6fb4718f3.tar.gz Qt-df55141aa260c8a10c06aa990b6f20d6fb4718f3.tar.bz2 | |
Fixed QImageReader::format() inconsistency.
If state is set to ReadHeader before canRead() then setFormat("png")
never gets called. We should make sure that setFormat() gets set
whenever canRead() returns true.
Task-number: QTBUG-2263
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/plugins/imageformats/mng')
| -rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index d408e6c..c134fd6 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -381,10 +381,10 @@ QMngHandler::~QMngHandler() bool QMngHandler::canRead() const { Q_D(const QMngHandler); - if (!d->haveReadNone) - return (!d->haveReadAll || (d->haveReadAll && (d->nextIndex < d->frameCount))); - - if (canRead(device())) { + if ((!d->haveReadNone + && (!d->haveReadAll || (d->haveReadAll && (d->nextIndex < d->frameCount)))) + || canRead(device())) + { setFormat("mng"); return true; } |