diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-01-13 12:07:11 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 15:52:01 +0100 |
| commit | ba1cf5dae397031730fb77321db1807937e81617 (patch) | |
| tree | 491f6eeeeba37dcb5764c0348ae4704c1e41c1e2 /src/gui/painting/qmemrotate_p.h | |
| parent | fe2344bd44e183b9893934d175c61a725af29b90 (diff) | |
Removed image format specific template functions in raster engine.
Simplified the raster engine by treating image formats in a more
generic way and removed some unused code.
Change-Id: Ib3979a1a6e3e6f17c5002248545779ec36fff7c9
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/painting/qmemrotate_p.h')
| -rw-r--r-- | src/gui/painting/qmemrotate_p.h | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index 4c4bc94767..a72310e330 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -70,37 +70,15 @@ QT_BEGIN_NAMESPACE #endif #endif -#define QT_DECL_MEMROTATE(srctype, desttype) \ - void Q_GUI_EXPORT qt_memrotate90(const srctype*, int, int, int, desttype*, int); \ - void Q_GUI_EXPORT qt_memrotate180(const srctype*, int, int, int, desttype*, int); \ - void Q_GUI_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int) +#define QT_DECL_MEMROTATE(type) \ + void Q_GUI_EXPORT qt_memrotate90(const type*, int, int, int, type*, int); \ + void Q_GUI_EXPORT qt_memrotate180(const type*, int, int, int, type*, int); \ + void Q_GUI_EXPORT qt_memrotate270(const type*, int, int, int, type*, int) -void Q_GUI_EXPORT qt_memrotate90(const quint32*, int, int, int, quint32*, int); -void Q_GUI_EXPORT qt_memrotate180(const quint32*, int, int, int, quint32*, int); -void Q_GUI_EXPORT qt_memrotate270(const quint32*, int, int, int, quint32*, int); - -QT_DECL_MEMROTATE(quint32, quint16); -QT_DECL_MEMROTATE(quint16, quint32); -QT_DECL_MEMROTATE(quint16, quint16); -QT_DECL_MEMROTATE(quint24, quint24); -QT_DECL_MEMROTATE(quint32, quint24); -QT_DECL_MEMROTATE(quint32, quint18); -QT_DECL_MEMROTATE(quint32, quint8); -QT_DECL_MEMROTATE(quint16, quint8); -QT_DECL_MEMROTATE(qrgb444, quint8); -QT_DECL_MEMROTATE(quint8, quint8); - -#ifdef QT_QWS_ROTATE_BGR -QT_DECL_MEMROTATE(quint16, qbgr565); -QT_DECL_MEMROTATE(quint32, qbgr565); -QT_DECL_MEMROTATE(qrgb555, qbgr555); -QT_DECL_MEMROTATE(quint32, qbgr555); -#endif - -#ifdef QT_QWS_DEPTH_GENERIC -QT_DECL_MEMROTATE(quint32, qrgb_generic16); -QT_DECL_MEMROTATE(quint16, qrgb_generic16); -#endif +QT_DECL_MEMROTATE(quint32); +QT_DECL_MEMROTATE(quint16); +QT_DECL_MEMROTATE(quint24); +QT_DECL_MEMROTATE(quint8); #undef QT_DECL_MEMROTATE |