diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 23:13:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 23:13:37 (GMT) |
| commit | 1dd510f486937974bf342dcbd6ce7cb7bb331375 (patch) | |
| tree | 08020d0a10b554abdf108cfa40c37d2d9e4f6d6c /src | |
| parent | f412a9cb0bd1438d1518cf6a8eda3fda5fbf64f5 (diff) | |
| parent | a65f53a09c2a5950bd8b98fd791dc413bb11f9bf (diff) | |
| download | Qt-1dd510f486937974bf342dcbd6ce7cb7bb331375.zip Qt-1dd510f486937974bf342dcbd6ce7cb7bb331375.tar.gz Qt-1dd510f486937974bf342dcbd6ce7cb7bb331375.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:
Fixed compilation of MeeGo graphics system without eglext.h
Fixed memory corruption issue in qt_blurImage for Indexed8 images.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpixmapfilter.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegoextensions.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 70770c4..26bffcc 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -764,10 +764,17 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp } if (transposed == 0) { - qt_memrotate90(reinterpret_cast<const quint32*>(temp.bits()), - temp.width(), temp.height(), temp.bytesPerLine(), - reinterpret_cast<quint32*>(img.bits()), - img.bytesPerLine()); + if (img.depth() == 8) { + qt_memrotate90(reinterpret_cast<const quint8*>(temp.bits()), + temp.width(), temp.height(), temp.bytesPerLine(), + reinterpret_cast<quint8*>(img.bits()), + img.bytesPerLine()); + } else { + qt_memrotate90(reinterpret_cast<const quint32*>(temp.bits()), + temp.width(), temp.height(), temp.bytesPerLine(), + reinterpret_cast<quint32*>(img.bits()), + img.bytesPerLine()); + } } else { img = temp; } diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h index 7f219de..f1a74f5 100644 --- a/src/plugins/graphicssystems/meego/qmeegoextensions.h +++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h @@ -43,7 +43,6 @@ #define MEXTENSIONS_H #include <EGL/egl.h> -#include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #include <private/qgl_p.h> |