diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-13 14:25:18 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-13 15:07:41 +0200 |
commit | 1582407fc782c0befd0760633324dd5c206524a1 (patch) | |
tree | e993d66e824da41ece006d44c48acd4df0ba749e /src/gui/image/qbmphandler.cpp | |
parent | 30cb91e17d2fbbdce90f7542f44e12af971ba2de (diff) |
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/image/qbmphandler.cpp')
-rw-r--r-- | src/gui/image/qbmphandler.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index d854b1765b..3011a6c130 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -580,12 +580,6 @@ bool qt_write_dib(QDataStream &s, QImage image) } else if (image.depth() == 32) { bpl_bmp = ((image.width()*24+31)/32)*4; nbits = 24; -#ifdef Q_WS_QWS - } else if (image.depth() == 1 || image.depth() == 8) { - // Qt for Embedded Linux doesn't word align. - bpl_bmp = ((image.width()*image.depth()+31)/32)*4; - nbits = image.depth(); -#endif } else { bpl_bmp = bpl; nbits = image.depth(); @@ -631,18 +625,9 @@ bool qt_write_dib(QDataStream &s, QImage image) int y; if (nbits == 1 || nbits == 8) { // direct output -#ifdef Q_WS_QWS - // Qt for Embedded Linux doesn't word align. - int pad = bpl_bmp - bpl; - char padding[4]; -#endif for (y=image.height()-1; y>=0; y--) { if (d->write((char*)image.scanLine(y), bpl) == -1) return false; -#ifdef Q_WS_QWS - if (d->write(padding, pad) == -1) - return false; -#endif } return true; } |