summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_gl_p.h
diff options
context:
space:
mode:
authorJani Hautakangas <jani.hautakangas@nokia.com>2011-02-07 11:38:51 (GMT)
committerJani Hautakangas <jani.hautakangas@nokia.com>2011-02-08 09:57:35 (GMT)
commit7dc4c8dc1dd4fba8072fd688014f74c98aeb3a23 (patch)
treeaeae13443ee35e076adf7cb6e8bcb1ce399786ec /src/opengl/qpixmapdata_gl_p.h
parentfe68a04ed15038a9e22b66c567bcd44ee93e33d1 (diff)
downloadQt-7dc4c8dc1dd4fba8072fd688014f74c98aeb3a23.zip
Qt-7dc4c8dc1dd4fba8072fd688014f74c98aeb3a23.tar.gz
Qt-7dc4c8dc1dd4fba8072fd688014f74c98aeb3a23.tar.bz2
Use the 'convertInPlace' versions of QImage in QGLPixmapData load.
Change QGLPixmapData load functions to use 'convertInPlace' versions of QImage to save memory. Task-number: QTBUG-17256 Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
-rw-r--r--src/opengl/qpixmapdata_gl_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 5545d3c..96631e6 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -107,6 +107,8 @@ public:
// Re-implemented from QPixmapData:
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,
@@ -149,6 +151,8 @@ private:
QImage fillImage(const QColor &color) const;
+ void createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace);
+
mutable QGLFramebufferObject *m_renderFbo;
mutable QPaintEngine *m_engine;
mutable QGLContext *m_ctx;