summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-03 15:28:05 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-08-03 15:45:47 (GMT)
commit2a671ee511a62fe04d53e9994b99e2cf8d525cb9 (patch)
treeb03851b569dede0b8e001fd0548fcdba98278d57 /src/gui
parent29f3ff7e8e4ecf1fcae1fb35434bd744cec97389 (diff)
downloadQt-2a671ee511a62fe04d53e9994b99e2cf8d525cb9.zip
Qt-2a671ee511a62fe04d53e9994b99e2cf8d525cb9.tar.gz
Qt-2a671ee511a62fe04d53e9994b99e2cf8d525cb9.tar.bz2
Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3
Exported function needs to have the qt_ prefix. Beviewed-by: Olivier Goffart Reviewed-by: Andreas Kling
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qimage_ssse3.cpp4
-rw-r--r--src/gui/image/qjpeghandler.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index cc4ac5e..9aed011 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
// Convert a scanline of RGB888 (src) to RGB32 (dst)
// src must be at least len * 3 bytes
// dst must be at least len * 4 bytes
-Q_GUI_EXPORT void QT_FASTCALL convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len)
+Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len)
{
quint32 *const end = dst + len;
@@ -138,7 +138,7 @@ void convert_RGB888_to_RGB32_ssse3(QImageData *dest, const QImageData *src, Qt::
quint32 *dest_data = (quint32 *) dest->data;
for (int i = 0; i < src->height; ++i) {
- convert_rgb888_to_rgb32_ssse3(dest_data, src_data, src->width);
+ qt_convert_rgb888_to_rgb32_ssse3(dest_data, src_data, src->width);
src_data += src->bytes_per_line;
dest_data = (quint32 *)((uchar*)dest_data + dest->bytes_per_line);
}
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 0b731cb..d358a5e 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -807,10 +807,10 @@ QJpegHandler::QJpegHandler()
const uint features = qDetectCPUFeatures();
// from qimage_ssse3.cpp
- Q_GUI_EXPORT void QT_FASTCALL convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len);
+ Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len);
if (features & SSSE3)
- rgb888ToRgb32ConverterPtr = convert_rgb888_to_rgb32_ssse3;
+ rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_ssse3;
#endif // QT_HAVE_SSSE3
}