diff -r ef0373b55136 -r 758a864f9613 src/openvg/qpixmapdata_vg_p.h --- a/src/openvg/qpixmapdata_vg_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/openvg/qpixmapdata_vg_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -64,6 +64,7 @@ class QEglContext; class QVGImagePool; +class QImageReader; #if !defined(QT_NO_EGL) class QVGPixmapData; @@ -87,6 +88,12 @@ 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 @@ protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; + void createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace); #if defined(Q_OS_SYMBIAN) void cleanup();