diff options
author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-03-09 14:18:08 (GMT) |
---|---|---|
committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-03-09 14:18:08 (GMT) |
commit | e496be83f0ba8849cace30078223eb0fd40f004e (patch) | |
tree | e9d0736269ab86d9ed9e6125ac6e419f8328cd0e /src/openvg/qpixmapdata_vg_p.h | |
parent | cf94df01d2d2364653f2ab602688394450e92d31 (diff) | |
parent | 56ad75da12ec6a4d7b65ce4e1a246ee48fda9736 (diff) | |
download | Qt-e496be83f0ba8849cace30078223eb0fd40f004e.zip Qt-e496be83f0ba8849cace30078223eb0fd40f004e.tar.gz Qt-e496be83f0ba8849cace30078223eb0fd40f004e.tar.bz2 |
Remerging SymbianLite to team repository.
Diffstat (limited to 'src/openvg/qpixmapdata_vg_p.h')
-rw-r--r-- | src/openvg/qpixmapdata_vg_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h index 58e69db..c4fd47f 100644 --- a/src/openvg/qpixmapdata_vg_p.h +++ b/src/openvg/qpixmapdata_vg_p.h @@ -54,6 +54,7 @@ // #include <QtGui/private/qpixmap_raster_p.h> +#include <QtGui/private/qvolatileimage_p.h> #include <private/qvg_p.h> #if defined(Q_OS_SYMBIAN) @@ -99,6 +100,7 @@ public: bool hasAlphaChannel() const; void setAlphaChannel(const QPixmap &alphaChannel); QImage toImage() const; + void copy(const QPixmapData *data, const QRect &rect); QImage *buffer(); QPaintEngine* paintEngine() const; @@ -161,7 +163,7 @@ protected: VGImage vgImage; VGImage vgImageOpacity; qreal cachedOpacity; - mutable QImage source; + mutable QVolatileImage source; mutable bool recreate; bool inImagePool; #if !defined(QT_NO_EGL) @@ -170,6 +172,8 @@ protected: void forceToImage(); QImage::Format sourceFormat() const; + QImage::Format idealFormat(QImage *image, Qt::ImageConversionFlags flags) const; + void updateSerial(); void destroyImageAndContext(); void destroyImages(); |