summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-03-15 10:29:58 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-03-15 10:37:14 (GMT)
commitab0bd00d06356ded7c53e61421e3139571410c2c (patch)
treee2168fa09a6ede3df5a4612037c4a72c6b76f344 /src
parent7d3ca146a5cd124357001257528c64c904677861 (diff)
downloadQt-ab0bd00d06356ded7c53e61421e3139571410c2c.zip
Qt-ab0bd00d06356ded7c53e61421e3139571410c2c.tar.gz
Qt-ab0bd00d06356ded7c53e61421e3139571410c2c.tar.bz2
Enable the fast paths when converting to Rgb565
The generic conversion is too slow for conversions to RGB565, which are common on embedded platforms (e.g.: Maemo). This patch enable the fast path for all conversion to rgb_565, it is a follow-up of 7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f Reviewed-by: Tom Cooksey
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qdrawhelper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 581b538..e5b3ac0 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -4734,7 +4734,7 @@ static void blend_untransformed_argb8565(int count, const QSpan *spans,
static void blend_untransformed_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)
@@ -5577,7 +5577,7 @@ static void blend_transformed_bilinear_argb8565(int count, const QSpan *spans, v
static void blend_transformed_bilinear_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_RGB16)
@@ -6164,7 +6164,7 @@ static void blend_transformed_argb8565(int count, const QSpan *spans,
static void blend_transformed_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)
@@ -6577,7 +6577,7 @@ static void blend_transformed_tiled_argb8565(int count, const QSpan *spans,
static void blend_transformed_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)