diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 15:27:59 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 15:27:59 (GMT) |
| commit | fa033bb0bc36737908375906bc47ac83300b0b5c (patch) | |
| tree | 962765cb4b07c7c40b96d3e87c21d10a10a402f8 /src/gui/painting/qblendfunctions.cpp | |
| parent | debca4dfbb45ee3f16c49e13f904efc0c589e4f1 (diff) | |
| download | Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.zip Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.tar.gz Qt-fa033bb0bc36737908375906bc47ac83300b0b5c.tar.bz2 | |
Various INTEGRITY fixes
Small-ish compilation fixes.
Note that "Value" is a reserved word on INTEGRITY, so we need to use the correct
namespace.
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/gui/painting/qblendfunctions.cpp')
| -rw-r--r-- | src/gui/painting/qblendfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index dc90003..10674f8 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -309,7 +309,7 @@ template <typename T> void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, const uchar *src = srcPixels + y * sbpl; const uchar *srcEnd = src + srcOffset; while (src < srcEnd) { -#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) +#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_)) // non-16-bit aligned memory access is not possible on PowerPC, // ARM <v6 (QT_ARCH_ARMV5) & SH & AVR32 & SPARC w/GCC quint16 spix = (quint16(src[2])<<8) + src[1]; |