diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-28 09:31:10 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-28 10:05:33 +0300 |
| commit | d5fe794178f755a259e7680bbf11571785abe14d (patch) | |
| tree | c96ef2f5c6f707b4639fdd740f91f8e2679c63e7 /src/datavisualization/data | |
| parent | ac276e4f176844e6048ad3eb7b4de5eed7eaefcf (diff) | |
Fix texture cleanup.
Make deleteTexture also zero the pointer and do the check if
deletion is needed, as those are required anyway on the caller
side in most cases.
Change-Id: Ia12102c97a647127230db2518c32f81322ce6743
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/data')
| -rw-r--r-- | src/datavisualization/data/customdataitem.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/datavisualization/data/customdataitem.cpp b/src/datavisualization/data/customdataitem.cpp index 8d3a033d..d5964c62 100644 --- a/src/datavisualization/data/customdataitem.cpp +++ b/src/datavisualization/data/customdataitem.cpp @@ -31,15 +31,14 @@ CustomDataItem::CustomDataItem() : CustomDataItem::~CustomDataItem() { - if (m_texture) - m_textureHelper->deleteTexture(&m_texture); + m_textureHelper->deleteTexture(&m_texture); delete m_textureHelper; } void CustomDataItem::setTextureImage(const QImage &textureImage) { - if (m_texture) - m_textureHelper->deleteTexture(&m_texture); + m_textureHelper->deleteTexture(&m_texture); + // Make a texture out of the image if (!textureImage.isNull()) m_texture = m_textureHelper->create2DTexture(textureImage, true, true, true); |