summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-06 13:50:38 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-06 17:21:02 (GMT)
commit296cf92e1047409a203294e81fb388cc6a0e5c85 (patch)
treee99bd421c73b84958ee9e1ffd5df5418f96e5085
parenta0f155cdaf641d92acc8b61be89b96319d16ccba (diff)
downloadQt-296cf92e1047409a203294e81fb388cc6a0e5c85.zip
Qt-296cf92e1047409a203294e81fb388cc6a0e5c85.tar.gz
Qt-296cf92e1047409a203294e81fb388cc6a0e5c85.tar.bz2
Use the fast Neon conversion for converting colors of jpeg images.
Reviewed-by: Andreas Kling
-rw-r--r--src/gui/image/qjpeghandler.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index d358a5e..eda5efb 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -803,9 +803,16 @@ bool QJpegHandlerPrivate::read(QImage *image)
QJpegHandler::QJpegHandler()
: d(new QJpegHandlerPrivate(this))
{
-#if defined(QT_HAVE_SSSE3)
const uint features = qDetectCPUFeatures();
-
+ Q_UNUSED(features);
+#if defined(QT_HAVE_NEON)
+ // from qimage_neon.cpp
+ Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len);
+
+ if (features & NEON)
+ rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon;
+#endif // QT_HAVE_NEON
+#if defined(QT_HAVE_SSSE3)
// from qimage_ssse3.cpp
Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len);