diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2020-09-01 15:48:00 +0200 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2020-09-15 15:55:46 +0200 |
| commit | d423fe985137be1283c0998f54b6ba307a8cf923 (patch) | |
| tree | 43e8f7326abf37d6bf2ee30f7a10b06d51cc5671 /src/gui/painting/qcolorspace.cpp | |
| parent | ecf4f8fc648a1f0830c1cf9abe007e84a770bf51 (diff) | |
QIcc: fix alignment concerns in ICC profile parsing
Updated QIcc::fromIccProfile() and friends to not rely on
QByteArray pointer alignment. Used qFromUnaligned() instead
Task-number: QTBUG-84267
Pick-to: 5.15
Change-Id: I69ef7e011707bec27cd84693e7f0e92d79a577d1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/painting/qcolorspace.cpp')
| -rw-r--r-- | src/gui/painting/qcolorspace.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index 86cb5db2ff..5ae071f480 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -666,9 +666,6 @@ QByteArray QColorSpace::iccProfile() const If the ICC profile is not supported an invalid QColorSpace is returned where you can still read the original ICC profile using iccProfile(). - \note If the QByteArray data is created from external sources it should be - at least 4 byte aligned. - \sa iccProfile() */ QColorSpace QColorSpace::fromIccProfile(const QByteArray &iccProfile) |