diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-21 10:49:12 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-21 10:49:12 (GMT) |
| commit | 3e45dbcc89a9f2284d8ab89e0c75bd7b275e6b61 (patch) | |
| tree | 5d17e1c459807a3d865f6fe1f16c1082258a21fe /src | |
| parent | 072a571fc0c41610b76465d76eb635b959eaad37 (diff) | |
| download | Qt-3e45dbcc89a9f2284d8ab89e0c75bd7b275e6b61.zip Qt-3e45dbcc89a9f2284d8ab89e0c75bd7b275e6b61.tar.gz Qt-3e45dbcc89a9f2284d8ab89e0c75bd7b275e6b61.tar.bz2 | |
RVCT 2.2 compiler can't handle static inline functions with templates.
Removed static keywords from offending functions.
Reviewed-by: axis
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpixmapfilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index caa0752..78a6b43 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -602,7 +602,7 @@ QRectF QPixmapBlurFilter::boundingRectFor(const QRectF &rect) const } template <int shift> -static inline int static_shift(int value) +inline int static_shift(int value) { if (shift == 0) return value; @@ -613,7 +613,7 @@ static inline int static_shift(int value) } template<int aprec, int zprec> -static inline void blurinner(uchar *bptr, int &zR, int &zG, int &zB, int &zA, int alpha) +inline void blurinner(uchar *bptr, int &zR, int &zG, int &zB, int &zA, int alpha) { QRgb *pixel = (QRgb *)bptr; @@ -646,7 +646,7 @@ static inline void blurinner(uchar *bptr, int &zR, int &zG, int &zB, int &zA, in const int alphaIndex = (QSysInfo::ByteOrder == QSysInfo::BigEndian ? 0 : 3); template<int aprec, int zprec> -static inline void blurinner_alphaOnly(uchar *bptr, int &z, int alpha) +inline void blurinner_alphaOnly(uchar *bptr, int &z, int alpha) { const int A_zprec = int(*(bptr)) << zprec; const int z_zprec = z >> aprec; @@ -655,7 +655,7 @@ static inline void blurinner_alphaOnly(uchar *bptr, int &z, int alpha) } template<int aprec, int zprec, bool alphaOnly> -static inline void blurrow(QImage & im, int line, int alpha) +inline void blurrow(QImage & im, int line, int alpha) { uchar *bptr = im.scanLine(line); |