diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-06-21 10:15:48 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-06-21 10:15:48 (GMT) |
commit | bbaa64882618e565510ef7ae959062073d4d2ae1 (patch) | |
tree | 2f5c51122092d22663a338402ee0fe1eb727b860 /src/gui/image/qpixmap_raster_p.h | |
parent | e2f0e728e85593b502940c16f1eead4bce673c2e (diff) | |
parent | 033fea2483945aa2ecb238751121098b594a1877 (diff) | |
download | Qt-bbaa64882618e565510ef7ae959062073d4d2ae1.zip Qt-bbaa64882618e565510ef7ae959062073d4d2ae1.tar.gz Qt-bbaa64882618e565510ef7ae959062073d4d2ae1.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 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: |