diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-25 23:01:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-25 23:01:42 (GMT) |
| commit | aab53973d060b744d54017464af226207c5a4d42 (patch) | |
| tree | 4f5ee7bae20acb7d347a4a11d3d94a24e677d325 /src/openvg/qpixmapdata_vg_p.h | |
| parent | 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac (diff) | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
| download | Qt-aab53973d060b744d54017464af226207c5a4d42.zip Qt-aab53973d060b744d54017464af226207c5a4d42.tar.gz Qt-aab53973d060b744d54017464af226207c5a4d42.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/openvg/qpixmapdata_vg_p.h')
| -rw-r--r-- | src/openvg/qpixmapdata_vg_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/openvg/qpixmapdata_vg_p.h b/src/openvg/qpixmapdata_vg_p.h index c21b48f..114d545 100644 --- a/src/openvg/qpixmapdata_vg_p.h +++ b/src/openvg/qpixmapdata_vg_p.h @@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE class QEglContext; class QVGImagePool; +class QImageReader; #if !defined(QT_NO_EGL) class QVGPixmapData; @@ -87,6 +88,12 @@ public: void resize(int width, int height); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); + void fromImageReader(QImageReader *imageReader, + Qt::ImageConversionFlags flags); + bool fromFile(const QString &filename, const char *format, + Qt::ImageConversionFlags flags); + bool fromData(const uchar *buffer, uint len, const char *format, + Qt::ImageConversionFlags flags); void fill(const QColor &color); bool hasAlphaChannel() const; @@ -126,6 +133,7 @@ public: protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; + void createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace); #if defined(Q_OS_SYMBIAN) void cleanup(); |