summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2010-06-07 17:08:46 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2010-06-07 17:08:46 (GMT)
commitfee316304b48bb3437e122c34b2127d6ccc4f469 (patch)
tree8484a674a9acb81d18c5a01ef9f2445c2a2a81b0 /src/gui
parentdfbd44c8ec75d3b0156547ef3fb5811a4548a0a5 (diff)
downloadQt-fee316304b48bb3437e122c34b2127d6ccc4f469.zip
Qt-fee316304b48bb3437e122c34b2127d6ccc4f469.tar.gz
Qt-fee316304b48bb3437e122c34b2127d6ccc4f469.tar.bz2
Revert accidental commit of irrelevant stuff. Silly mondays..
This reverts commit dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qimage.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 6408432..98f235e 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -245,11 +245,6 @@ 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();
@@ -903,11 +898,6 @@ 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;
}