alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix leaking texture

Browse Source
This commit is contained in:
David Edmundson 2014-02-20 12:25:30 +01:00
parent 9459ed1f02
commit d0bc8b2a75
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/declarativeimports/core/svgitem.cpp
View File

@ -34,7 +34,8 @@ namespace Plasma
SvgItem::SvgItem(QQuickItem *parent)
: QQuickItem(parent),
m_smooth(false),
m_dirty(false)
m_dirty(false),
m_texture(0)
{
setFlag(QQuickItem::ItemHasContents, true);
}
@ -42,6 +43,7 @@ SvgItem::SvgItem(QQuickItem *parent)
SvgItem::~SvgItem()
{
delete m_texture;
}
void SvgItem::setElementId(const QString &elementID)
@ -136,11 +138,14 @@ QSGNode* SvgItem::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updateP
if (window() && m_svg) {
m_svg.data()->resize(width(), height());
qDebug() << "called";
//TODO make m_svg return a QImage so that we can avoid the deep copy in toImage();
const QPixmap pixmap = m_svg.data()->pixmap();
textureNode->setRect(0,0, pixmap.width(), pixmap.height());
textureNode->setTexture(window()->createTextureFromImage(pixmap.toImage()));
m_svg.data()->setContainsMultipleImages(!m_elementID.isEmpty());
const QImage image = m_svg.data()->image(m_elementID);
textureNode->setRect(0,0, image.width(), image.height());
delete m_texture;
m_texture = window()->createTextureFromImage(image);
textureNode->setTexture(m_texture);
m_dirty = false;
}
return textureNode;

2
src/declarativeimports/core/svgitem.h
View File

@ -22,6 +22,7 @@
#include <QQuickItem>
class QImage;
class QSGTexture;
namespace Plasma {
class Svg;
@ -104,6 +105,7 @@ protected Q_SLOTS:
private:
QWeakPointer<Plasma::Svg> m_svg;
QString m_elementID;
QSGTexture *m_texture;
bool m_smooth;
bool m_dirty;
};