Merge lp:~daniel-stehn/forssim/MemoryLeakFixInAHapticDrillForce into lp:forssim

[Daniel Stehn]

[Daniel Stehn (daniel-stehn)]

Added a destructor for the class AHapticDrillForce that deletes a pointer that never was destructed.

In ADrillForce::traverseSG( H3D::TraverseInfo &ti ) a pointer "generated_force" is allocated. This pointer becomes a part of another pointer (AHapticDrillForce), that is passed into the H3D::TraverseInfo reference.

AHapticDrillForce was responsible to clear the memory allocated by the generated_force pointer, but it didn't. Now there is a destructor that does the cleaning up.

=== modified file 'src/AHapticDrillForce.cpp'
--- src/AHapticDrillForce.cpp	2009-03-13 15:10:45 +0000
+++ src/AHapticDrillForce.cpp	2009-09-11 12:08:46 +0000
@@ -44,6 +44,13 @@
 			bitRadius( _bitRadius){
 }
 
+AHapticDrillForce::~AHapticDrillForce()
+{
+	//Need to delete generated_force which is allocated in ADrillForce::traverseSG
+	if( generated_force )
+		delete generated_force;
+}
+
 
 HAPI::Vec3 AHapticDrillForce::evaluate_forces(HAPI::Vec3 probe_position)
 {

=== modified file 'src/AHapticDrillForce.h'
--- src/AHapticDrillForce.h	2009-03-13 15:10:45 +0000
+++ src/AHapticDrillForce.h	2009-09-11 12:08:46 +0000
@@ -70,6 +70,8 @@
 			double _drillFactor,
 			double _bitRadius);
 
+	virtual ~AHapticDrillForce();
+
 	/**
 	 * The force of the EffectOutput will be the force of the force field.
 	 */