diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-06-28 10:55:02 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-06-28 10:55:02 (GMT) |
| commit | fd8e9eadd087d11b0a01d598132ccbb19667fa5a (patch) | |
| tree | 1b79721faac13600ba377bf3130e8800436b5ad5 | |
| parent | 863733d86e2dd0cd508e2928e5f995b88579ab40 (diff) | |
| download | Qt-fd8e9eadd087d11b0a01d598132ccbb19667fa5a.zip Qt-fd8e9eadd087d11b0a01d598132ccbb19667fa5a.tar.gz Qt-fd8e9eadd087d11b0a01d598132ccbb19667fa5a.tar.bz2 | |
New variant of ::createPixmapData with origin for QGraphicsSystem.
Merge-request: 705
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/gui/painting/qgraphicssystem.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qgraphicssystem_p.h | 1 | ||||
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp index 2ea3d33..69ce47e 100644 --- a/src/gui/painting/qgraphicssystem.cpp +++ b/src/gui/painting/qgraphicssystem.cpp @@ -79,5 +79,9 @@ QPixmapData *QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixelType typ return 0; } +QPixmapData *QGraphicsSystem::createPixmapData(QPixmapData *origin) +{ + return createPixmapData(origin->pixelType()); +} QT_END_NAMESPACE diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h index ddca788..1211505 100644 --- a/src/gui/painting/qgraphicssystem_p.h +++ b/src/gui/painting/qgraphicssystem_p.h @@ -64,6 +64,7 @@ class Q_GUI_EXPORT QGraphicsSystem { public: virtual QPixmapData *createPixmapData(QPixmapData::PixelType type) const = 0; + virtual QPixmapData *createPixmapData(QPixmapData *origin); virtual QWindowSurface *createWindowSurface(QWidget *widget) const = 0; virtual ~QGraphicsSystem() = 0; diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 32a8578..1c3ae10 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -416,7 +416,7 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) for (int i = 0; i < m_pixmapDatas.size(); ++i) { QRuntimePixmapData *proxy = m_pixmapDatas.at(i); - QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data->pixelType()); + QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data); // ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers. newData->fromImage(proxy->m_data->toImage(), Qt::AutoColor | Qt::OrderedAlphaDither); delete proxy->m_data; |