diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-06-21 19:54:16 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-06-21 19:54:16 (GMT) |
| commit | c888f0212e6f1f2c09984527ae27d6a87e7e0d89 (patch) | |
| tree | 0c96c3c15feead446bc488fcb64a475503ef99c7 /src/gui/image/qpixmap_raster_p.h | |
| parent | 066fe8ab70508af6310c49e6eb9cdd74962b6401 (diff) | |
| parent | 02c83c2adf0513041d9a3866d4e589ad79d61bda (diff) | |
| download | Qt-c888f0212e6f1f2c09984527ae27d6a87e7e0d89.zip Qt-c888f0212e6f1f2c09984527ae27d6a87e7e0d89.tar.gz Qt-c888f0212e6f1f2c09984527ae27d6a87e7e0d89.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/gui/image/qpixmap_raster_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_raster_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 6cdd3d7..d7e3f85 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -72,6 +72,7 @@ public: void resize(int width, int height); void fromFile(const QString &filename, Qt::ImageConversionFlags flags); + bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); bool scroll(int dx, int dy, const QRect &rect); @@ -85,6 +86,8 @@ public: protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; + void createPixmapForImage(QImage &sourceImage, Qt::ImageConversionFlags flags, bool inPlace); + void setImage(const QImage &image); QImage image; private: |