aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barker <jesse.barker@linaro.org>2012-12-17 08:08:05 -0800
committerJesse Barker <jesse.barker@linaro.org>2012-12-17 08:08:05 -0800
commit6bd7e1c7b7aa65a2f473c0d4dedd0f47d084b848 (patch)
tree81f7c4aa95fe9f5c122a12353506b6ed24cab873
parent499a89d1e845fd88b13216cb91a35d1071a7aa72 (diff)
downloadglmark2-6bd7e1c7b7aa65a2f473c0d4dedd0f47d084b848.tar.gz
SceneShadow: Port potential memory leak fix from SceneRefract (detected in both
scenes during code review for that branch merge).
-rw-r--r--src/scene-shadow.cpp6
-rw-r--r--src/scene.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/src/scene-shadow.cpp b/src/scene-shadow.cpp
index 4fd27c7..dbad8a4 100644
--- a/src/scene-shadow.cpp
+++ b/src/scene-shadow.cpp
@@ -463,11 +463,6 @@ SceneShadow::SceneShadow(Canvas& canvas) :
"false,true");
}
-SceneShadow::~SceneShadow()
-{
- delete priv_;
-}
-
bool
SceneShadow::supported(bool show_errors)
{
@@ -526,6 +521,7 @@ SceneShadow::teardown()
{
// Add scene-specific teardown here
priv_->teardown();
+ delete priv_;
Scene::teardown();
}
diff --git a/src/scene.h b/src/scene.h
index 66377e1..8c4d752 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -563,7 +563,6 @@ class SceneShadow : public Scene
ShadowPrivate* priv_;
public:
SceneShadow(Canvas& canvas);
- ~SceneShadow();
bool supported(bool show_errors);
bool load();
void unload();