diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-06-17 09:28:21 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-08-21 08:35:47 (GMT) |
| commit | cb292a2dac71aeed0a8438f7ce6c6dc61d8f8f83 (patch) | |
| tree | f958ca7481a0645d85fe2b34e31a4599a1b38740 /src/gui/painting/qblendfunctions.cpp | |
| parent | 119a67e338c8e6c3616781cee1027031b667676e (diff) | |
| download | Qt-cb292a2dac71aeed0a8438f7ce6c6dc61d8f8f83.zip Qt-cb292a2dac71aeed0a8438f7ce6c6dc61d8f8f83.tar.gz Qt-cb292a2dac71aeed0a8438f7ce6c6dc61d8f8f83.tar.bz2 | |
Fix blend function crash on AVR32
AVR32 doesn't support non-aligned access. (Contributed patch)
Task-number: 255495
Reviewed-by: Paul
Diffstat (limited to 'src/gui/painting/qblendfunctions.cpp')
| -rw-r--r-- | src/gui/painting/qblendfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index e447301..cd78de0 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -374,9 +374,9 @@ 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_ARM) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) +#if defined(QT_ARCH_ARM) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) // non-16-bit aligned memory access is not possible on PowerPC, - // ARM <v6 (QT_ARCH_ARMV6) & SH + // ARM <v6 (QT_ARCH_ARMV6) & SH & AVR32 quint16 spix = (quint16(src[2])<<8) + src[1]; #else quint16 spix = *(quint16 *) (src + 1); |