diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 11:37:37 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 11:37:37 (GMT) |
| commit | f332786abc6817fefaa683fb22caa40184c1316e (patch) | |
| tree | f604af4c61007eee49d39d715b300c3622c52753 /src/gui/image | |
| parent | 9a3f592966b9227f099e752f578a157500989146 (diff) | |
| parent | 61aae4e9a033bfb59664105e5377fd086bacb517 (diff) | |
| download | Qt-f332786abc6817fefaa683fb22caa40184c1316e.zip Qt-f332786abc6817fefaa683fb22caa40184c1316e.tar.gz Qt-f332786abc6817fefaa683fb22caa40184c1316e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index aac159e..6872cfa 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -637,7 +637,7 @@ void QMacPixmapData::macCreatePixels() } if (pixels) - memcpy(base_pixels, pixels, pixelsSize); + memcpy(base_pixels, pixels, qMin(pixelsSize, (uint) numBytes)); pixels = base_pixels; pixelsSize = numBytes; } |