diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-30 13:21:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 01:18:03 +0200 |
| commit | 67245d1708696627a33afa0abc9f3c2b178b8d95 (patch) | |
| tree | 29ff5456b6e6e9c0d2996fe7b84ff4987c39eafd /src | |
| parent | b46189c3c3a92c9093bd05bf976b2e7a368511a3 (diff) | |
Fix compiler warning in qdrawhelper.cpp
warning: always_inline function might not be inlinable [-Wattributes]
Those function are only used in array of function pointers. They
cannot be inlined.
Change-Id: I82b10d82ac8915129dc8921b1a74d42d8547bc40
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index de331a3853..17877b79d5 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -565,9 +565,8 @@ static const uint *QT_FASTCALL fetchUntransformedRGB16(uint *buffer, const Opera // blendType is either BlendTransformed or BlendTransformedTiled template<TextureBlendType blendType> -Q_STATIC_TEMPLATE_FUNCTION -const uint *QT_FASTCALL fetchTransformedARGB32PM(uint *buffer, const Operator *, const QSpanData *data, - int y, int x, int length) +static const uint *QT_FASTCALL fetchTransformedARGB32PM(uint *buffer, const Operator *, const QSpanData *data, + int y, int x, int length) { int image_width = data->texture.width; int image_height = data->texture.height; @@ -647,8 +646,7 @@ const uint *QT_FASTCALL fetchTransformedARGB32PM(uint *buffer, const Operator *, } template<TextureBlendType blendType> /* either BlendTransformed or BlendTransformedTiled */ -Q_STATIC_TEMPLATE_FUNCTION -const uint *QT_FASTCALL fetchTransformed(uint *buffer, const Operator *, const QSpanData *data, +static const uint *QT_FASTCALL fetchTransformed(uint *buffer, const Operator *, const QSpanData *data, int y, int x, int length) { int image_width = data->texture.width; @@ -852,10 +850,9 @@ inline void fetchTransformedBilinear_pixelBounds<BlendTransformedBilinear>(int, } template<TextureBlendType blendType> /* blendType = BlendTransformedBilinear or BlendTransformedBilinearTiled */ -Q_STATIC_TEMPLATE_FUNCTION -const uint * QT_FASTCALL fetchTransformedBilinearARGB32PM(uint *buffer, const Operator *, - const QSpanData *data, int y, int x, - int length) +static const uint * QT_FASTCALL fetchTransformedBilinearARGB32PM(uint *buffer, const Operator *, + const QSpanData *data, int y, int x, + int length) { int image_width = data->texture.width; int image_height = data->texture.height; @@ -1302,9 +1299,8 @@ const uint * QT_FASTCALL fetchTransformedBilinearARGB32PM(uint *buffer, const Op // blendType = BlendTransformedBilinear or BlendTransformedBilinearTiled template<TextureBlendType blendType> -Q_STATIC_TEMPLATE_FUNCTION -const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *, - const QSpanData *data, int y, int x, int length) +static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *, + const QSpanData *data, int y, int x, int length) { const QPixelLayout *layout = &qPixelLayouts[data->texture.format]; const QRgb *clut = data->texture.colorTable ? data->texture.colorTable->constData() : 0; |