diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 01:00:46 +0200 |
| commit | 3460e6e941181ccdc56e74d5bd1ed190b6e6f417 (patch) | |
| tree | bc4379b75ad945325248fec9841b7cd75850ade0 /src/gui | |
| parent | 6b66108c1ffc48ee1dc06c4e25d9210bf2d41084 (diff) | |
| parent | 0998a9d1d53361e572d7377af8cb41a49bbfad72 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ib7c4fc52915b5e6c72b9aa262fb59f2a041dccd7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 8b2db6d346..79a3e35935 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1331,7 +1331,7 @@ QRect QImage::rect() const The image depth is the number of bits used to store a single pixel, also called bits per pixel (bpp). - The supported depths are 1, 8, 16, 24 and 32. + The supported depths are 1, 8, 16, 24, 32 and 64. \sa bitPlaneCount(), convertToFormat(), {QImage#Image Formats}{Image Formats}, {QImage#Image Information}{Image Information} @@ -1574,7 +1574,9 @@ void QImage::setColor(int i, QRgb c) Returns a pointer to the pixel data at the scanline with index \a i. The first scanline is at index 0. - The scanline data is aligned on a 32-bit boundary. + The scanline data is as minimum 32-bit aligned. For 64-bit formats + it follows the native alignment of 64-bit integers (64-bit for most + platforms, but notably 32-bit on i386). \warning If you are accessing 32-bpp image data, cast the returned pointer to \c{QRgb*} (QRgb has a 32-bit size) and use it to |