From 797680a535f395cbe568d3612f216eb3dfe673fc Mon Sep 17 00:00:00 2001 From: erwin coumans Date: Thu, 14 Jul 2016 20:42:00 -0700 Subject: [PATCH] Remove memory leak in SimpleOpenGL3 example code --- examples/OpenGLWindow/SimpleOpenGL3App.cpp | 6 +++++- examples/SimpleOpenGL3/main.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp index 0ed1db2ea..ba7f1c076 100644 --- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp +++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp @@ -650,9 +650,13 @@ void SimpleOpenGL3App::setBackgroundColor(float red, float green, float blue) SimpleOpenGL3App::~SimpleOpenGL3App() { + + delete m_instancingRenderer; delete m_primRenderer ; - + sth_delete(m_data->m_fontStash); + delete m_data->m_renderCallbacks; m_window->closeWindow(); + TwDeleteDefaultFonts(); delete m_window; delete m_data ; } diff --git a/examples/SimpleOpenGL3/main.cpp b/examples/SimpleOpenGL3/main.cpp index 726abf693..5a2752e73 100644 --- a/examples/SimpleOpenGL3/main.cpp +++ b/examples/SimpleOpenGL3/main.cpp @@ -1,3 +1,4 @@ + #include "OpenGLWindow/SimpleOpenGL3App.h" #include "Bullet3Common/b3Quaternion.h" #include "Bullet3Common/b3CommandLineArgs.h" @@ -78,7 +79,7 @@ int main(int argc, char* argv[]) app->m_window->setResizeCallback(MyResizeCallback); - myArgs.GetCmdLineArgument("mp4_file",gVideoFileName); + myArgs.GetCmdLineArgument("mp4_file",gVideoFileName); if (gVideoFileName) app->dumpFramesToVideo(gVideoFileName); @@ -150,6 +151,9 @@ int main(int argc, char* argv[]) } while (!app->m_window->requestedExit()); + delete app; + + delete[] image; return 0; }