Fixed the memory leak in MY code, but not ingeneral. The leak is in the image.h save function

Pavel Govyadinov
1 parent 7d3162a2
Showing 3 changed files with 12 additions and 11 deletions Show diff stats
stim/cuda/testKernel.cuh
stim/gl/gl_spider.h
stim/math/vector.h
@@ -120,7 +120,7 @@
 		cudaDeviceSynchronize();
 		stringstream name;      //for debugging
 		name << nam.c_str();
-		stim::gpu2image<float>(print, name.str(),x,y,0,255);
+		//stim::gpu2image<float>(print, name.str(),x,y,0,255);
 		tx.UnmapCudaTexture();
 		cleanUP();
@@ -52,7 +52,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		stim::vec3<float> p;  	//vector designating the position of the spider.
 		stim::vec3<float> d;	//vector designating the orientation of the spider
 						//always a unit vector.
-		stim::vec3<float> m;	//magnitude of the spider vector.
+		stim::vec<float> m;	//magnitude of the spider vector.
 						//mag[0] = length.
 						//mag[1] = width.
 		std::vector<stim::vec3<float> > dV;	//A list of all the direction vectors.
@@ -983,7 +983,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		}
 		///Returns the m vector.
-		vec<float>
+		stim::vec<float>
 		getMagnitude()
 		{
 			return m;
@@ -1092,7 +1092,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		///rotates from 0.0, 0.0, 1.0 to dir.
 		///return is in degrees for use with glRotatef.
 		stim::vec<float>
-		getRotation(stim::vec<float> dir)
+		getRotation(stim::vec3<float> dir)
 		{
 			stim::vec<float> out(0.0,0.0,0.0,0.0);
 			stim::vec<float> from(0.0,0.0,1.0);
@@ -1104,7 +1104,8 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 				out[3] = 1.0;
 			} else {
 				stim::vec<float> temp(0.0, 0.0, 0.0);;
-				temp = (from.cross(dir)).norm();
+				stim::vec<float> dir1(dir[0], dir[1], dir[2]);
+				temp = (from.cross(dir1)).norm();
 				out[1] = temp[0];
 				out[2] = temp[1];
 				out[3] = temp[2];
@@ -75,12 +75,12 @@ struct vec : public std::vector&lt;T&gt;
 		}
 	}
-	vec( vec3<T>& other){
-		resize(3);							//resize the current vector to match the copy
-		for(size_t i=0; i<3; i++){	//copy each element
-			at(i) = other[i];
-		}
-	}
+//	vec( vec3<T>& other){
+//		resize(3);							//resize the current vector to match the copy
+//		for(size_t i=0; i<3; i++){	//copy each element
+//			at(i) = other[i];
+//		}
+//	}
 	//I'm not sure what these were doing here.
 	//Keep them now, we'll worry about it later.