diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
| commit | dd8a0d85b070c363c8e4575ec967ae0ad8dfebec (patch) | |
| tree | 5901a878931bbd3c4bffed0b0dba332af5e04181 /src/gui/image/qbmphandler.cpp | |
| parent | c0160230c4fd6f226d0c5ddabe3762f5fa855768 (diff) | |
| parent | ec90f6ed28ec735ce963c4257ea1095ecbc6c6ba (diff) | |
| download | Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.zip Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.gz Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.bz2 | |
Merge commit 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qbmphandler.cpp')
| -rw-r--r-- | src/gui/image/qbmphandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index 854be2e..42e19b8 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -144,7 +144,7 @@ static QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi) static int calc_shift(int mask) { int result = 0; - while (!(mask & 1)) { + while (mask && !(mask & 1)) { result++; mask >>= 1; } |