Changeset 1481 for trunk

Timestamp:

May 31, 2009 11:52:53 AM (15 years ago)

Author:

vrinside

Message:

fixed some memory leaks

Location:

trunk/packages/vizservers/nanovis

Files:

• NvLIC.cpp (modified) (2 diffs)
• NvParticleRenderer.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ -125 +125 @@
 NvLIC::~NvLIC()
 {
+    glDeleteTextures(1, &pattern_tex);
+    glDeleteTextures(1, &mag_tex);
+
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, vel_fbo);
     glDeleteTextures(1, &slice_vector_tex);
@@ -135 +138 @@
 
     glDeleteLists(disListID, Npat);
-
-    delete slice_vector;
+    
+/*
+    TBD..
+    cgDestroyParameter(m_vel_tex_param_render_vel);
+    cgDestroyParameter(m_plane_normal_param_render_vel);
+    cgDestroyParameter(m_max_param);
+    cgDestroyProgram(m_render_vel_fprog);
+*/
+
+    delete [] slice_vector;
 }
 

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -47 +47 @@
     _slice_pos = 0.0;
 
-    data = (Particle*) malloc(w*h*sizeof(Particle));
+    data = new Particle[w*h];
     memset(data, 0, sizeof(Particle) * w * h);
 
@@ -125 +125 @@
 NvParticleRenderer::~NvParticleRenderer()
 {
+    glDeleteTextures(1, &initPosTex);
+
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, psys_fbo[0]);
     glDeleteTextures(1, psys_tex);
@@ -137 +139 @@
     delete _advectionShader;
 #endif
-    free(data);
+    delete [] data;
 }