From d5fe794178f755a259e7680bbf11571785abe14d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 28 Apr 2014 09:31:10 +0300 Subject: Fix texture cleanup. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ää --- src/datavisualization/data/customdataitem.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/data') 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); -- cgit v1.2.3