diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 11:12:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 11:12:38 (GMT) |
| commit | 261eab49e7b7dcf21803d545dc03b9a44dc575e5 (patch) | |
| tree | 580f00e10d6df402e676cc21ab35af88ae955613 /src/opengl | |
| parent | 809fb65022a5c7ef09803478d637c33534dc1b80 (diff) | |
| parent | 0ceeded769563914622d26f35397921001c889c8 (diff) | |
| download | Qt-261eab49e7b7dcf21803d545dc03b9a44dc575e5.zip Qt-261eab49e7b7dcf21803d545dc03b9a44dc575e5.tar.gz Qt-261eab49e7b7dcf21803d545dc03b9a44dc575e5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglpixmapfilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index 0603369..656957d 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -341,7 +341,7 @@ bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const { QGLPixmapBlurFilter *filter = const_cast<QGLPixmapBlurFilter *>(this); - int radius = this->radius(); + int radius = qRound(this->radius()); if (!m_haveCached || (m_hint == Qt::QualityHint && radius != m_cachedRadius)) { // Only regenerate the shader from source if parameters have changed. m_haveCached = true; @@ -530,7 +530,7 @@ bool QGLPixmapDropShadowFilter::processGL(QPainter *painter, const QPointF &pos, { QGLPixmapDropShadowFilter *filter = const_cast<QGLPixmapDropShadowFilter *>(this); - int radius = this->blurRadius(); + int radius = qRound(this->blurRadius()); if (!m_haveCached || (m_hint == Qt::QualityHint && radius != m_cachedRadius)) { // Only regenerate the shader from source if parameters have changed. m_haveCached = true; |