diff options
author | Andreas Kling <andreas.kling@nokia.com> | 2010-06-07 16:49:48 (GMT) |
---|---|---|
committer | Andreas Kling <andreas.kling@nokia.com> | 2010-06-07 16:51:25 (GMT) |
commit | dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5 (patch) | |
tree | b9ae1bef368a37e9b2e0bdbcbe1cbf9cc1655e96 /src/gui | |
parent | d26856959f5031c03ed245df5aa9cb3b15a0596b (diff) | |
download | Qt-dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5.zip Qt-dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5.tar.gz Qt-dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5.tar.bz2 |
Unbreak Linux build when qendian.h is included before qglobal.h
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qimage.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 98f235e..6408432 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -245,6 +245,11 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format, int nu return 0; } + if (d->nbytes == 15840000) + { + d->nbytes = 15840000; + } + d->ref.ref(); return d.take(); @@ -898,6 +903,11 @@ QImageData *QImageData::create(uchar *data, int width, int height, int bpl, QIm d->bytes_per_line = bpl; d->nbytes = d->bytes_per_line * height; + if (d->nbytes == 15840000) + { + d->nbytes = 15840000; + } + return d; } |