diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-03 02:34:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-03 02:34:21 (GMT) |
| commit | 4578d719bd35a43b87a861843851f145ae115282 (patch) | |
| tree | 9634e5cd02df6ce619428607a69ec641913ea05c /src | |
| parent | 542aee134b56f5ce5e10a471af100fbfbc9a42e0 (diff) | |
| parent | 7d1a19669b8828803d7393396b1f109d86009d3b (diff) | |
| download | Qt-4578d719bd35a43b87a861843851f145ae115282.zip Qt-4578d719bd35a43b87a861843851f145ae115282.tar.gz Qt-4578d719bd35a43b87a861843851f145ae115282.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
| -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 de985d8..0f6a349 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -234,7 +234,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, #define LM(l, m) (((m)<<8)|l) digress = false; - int initial = length; + const int initial = length; while (!digress && length) { length--; unsigned char ch=*buffer++; @@ -333,7 +333,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, sheight = newtop + newheight; QImage::Format format = trans_index >= 0 ? QImage::Format_ARGB32 : QImage::Format_RGB32; - if (image->isNull() || (image->size() != QSize(swidth, sheight)) || image->format() != format) { + if (image->isNull()) { (*image) = QImage(swidth, sheight, format); memset(image->bits(), 0, image->numBytes()); |