summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-03-04 09:01:56 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-03-04 09:09:32 (GMT)
commit7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f (patch)
tree2dc557914b264cdf0597e05cace4e0daef5ed03b
parenta63dc3b837fbabafcd8ccdc6c30e304f69b278da (diff)
downloadQt-7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f.zip
Qt-7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f.tar.gz
Qt-7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f.tar.bz2
Enable two fast path for blend_tiled_rgb565
Blending ARGB8565 and RGB16 on top of RGB16 is common on system with 16 bits color depth. The faster blending functions can be used instead of blend_tiled_generic. Reviewed-by: Tom Cooksey
-rw-r--r--src/gui/painting/qdrawhelper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 891f4c2..8d2da69 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -5072,7 +5072,7 @@ static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData)
static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData)
{
-#if defined(QT_QWS_DEPTH_16)
+#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16)
QSpanData *data = reinterpret_cast<QSpanData *>(userData);
if (data->texture.format == QImage::Format_ARGB8565_Premultiplied)