diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-01 23:48:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-01 23:48:33 (GMT) |
| commit | d031b1aba3110776de4b70f8ffcb828f60b8b654 (patch) | |
| tree | 581da27112d97033b037b1af1e2395345ec84f41 /src/gui/image/qpixmap_mac.cpp | |
| parent | 16fdbcd175d29373a662dc9fb3606b26fc81c9c1 (diff) | |
| parent | 348894a550510e54e7709d18676b4b10c9e5e9e3 (diff) | |
| download | Qt-d031b1aba3110776de4b70f8ffcb828f60b8b654.zip Qt-d031b1aba3110776de4b70f8ffcb828f60b8b654.tar.gz Qt-d031b1aba3110776de4b70f8ffcb828f60b8b654.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid buffer overrun in QMacPixmapData resizing
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Missing glyphs transforming QStaticText on X11/raster with subpixel AA
Fixed clipping errors for non-extended paint engines.
Diffstat (limited to 'src/gui/image/qpixmap_mac.cpp')
| -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; } |