diff options
| author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-09-20 12:51:17 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-20 12:56:27 +0300 |
| commit | d57aabe85e6b4012f93348884df16262889906d8 (patch) | |
| tree | 4890063e229d89afbf5ba140068ecd4d656ccb58 /src/datavisualization/engine | |
| parent | 0d74bd964a2f63c303cc03d83c1ae02991b8e0ec (diff) | |
Fixed Valgrind reported memory issues.
Change-Id: I9ccb460b5cceb969827ede510b3c05d07467358d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/q3dcamera.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index edb0d971..bf57f21f 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -52,6 +52,8 @@ Bars3DRenderer::Bars3DRenderer(Bars3DController *controller) : Abstract3DRenderer(controller), m_controller(controller), m_cachedIsSlicingActivated(false), + m_cachedRowCount(0), + m_cachedColumnCount(0), m_selectedBar(0), m_sliceSelection(0), m_sliceCache(0), diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 229657fd..a3f46a17 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -74,7 +74,7 @@ void Q3DCamera::copyValuesFrom(const Q3DCamera &source) float *values = new float[16]; source.d_ptr->m_viewMatrix.copyDataTo(values); d_ptr->m_viewMatrix = QMatrix4x4(values); - delete values; + delete[] values; d_ptr->m_xRotation = source.d_ptr->m_xRotation; d_ptr->m_yRotation = source.d_ptr->m_yRotation; diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 308f449e..5fb4f114 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -142,6 +142,11 @@ Surface3DRenderer::~Surface3DRenderer() if (m_selectionPointer) delete m_selectionPointer; + + for (int i = 0; i < m_dataArray.size(); i++) + delete m_dataArray.at(i); + m_dataArray.clear(); + } void Surface3DRenderer::initializeOpenGL() |