diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 16:05:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 16:05:36 (GMT) |
| commit | f175c9e91cfb0395ff746ee0804495f5c01018dd (patch) | |
| tree | d4448232f54531fa70072e290d281559794063c5 /src/gui/image | |
| parent | 6796df2c4cbfa658d563a0786b4ba83597247b8d (diff) | |
| parent | 177131d06d0d7a39d5de210ac8ed5dff9ca4999f (diff) | |
| download | Qt-f175c9e91cfb0395ff746ee0804495f5c01018dd.zip Qt-f175c9e91cfb0395ff746ee0804495f5c01018dd.tar.gz Qt-f175c9e91cfb0395ff746ee0804495f5c01018dd.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index ffad75b..075d5da 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -864,7 +864,7 @@ static bool read_xpm_body( QByteArray buf(200, 0); int i; - if (cpp > 15) + if (cpp < 0 || cpp > 15) return false; // For > 256 colors, we delay creation of the image until |