diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-06-06 11:19:45 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-06-06 11:19:45 (GMT) |
| commit | 872da4c22ed2a82c7e2624b8aef8ebba6c1323d9 (patch) | |
| tree | cd786e093b64b8685a5d49bd48778a9650ee241f /src/gui/image | |
| parent | 1a74ca1d05c7c819db89a82de613d73244b7a980 (diff) | |
| parent | ed2b7e6c592dcf24de2bf34a693f54b5dd569194 (diff) | |
| download | Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.zip Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.tar.gz Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.tar.bz2 | |
Merge branch '4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/bwins/QtGuiu.def
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 cb30161..bdf1f90 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -648,7 +648,7 @@ void QMacPixmapData::macCreatePixels() } if (pixels) - memcpy(base_pixels, pixels, pixelsSize); + memcpy(base_pixels, pixels, qMin(pixelsSize, (uint) numBytes)); pixels = base_pixels; pixelsSize = numBytes; } |