fixed Linux compiler errors

david
1 parent 26da82c8
Showing 4 changed files with 13 additions and 13 deletions Show diff stats
stim/gl/gl_texture.h
stim/grids/grid.h
stim/grids/image_stack.h
stim/parser/filename.h
@@ -47,8 +47,8 @@ class gl_texture : public virtual image_stack&lt;T, F&gt;
 		//initializes important variables
 		void init() {
 			texID = 0;							//initialize texture ID to zero, default if OpenGL returns an error
-			memset(R, 0, sizeof(size_t));
-			memset(S, 0, sizeof(F));
+			//memset(R, 0, sizeof(size_t));
+			//memset(grid<T, 4, F>::S, 0, sizeof(F));
 		}
 		//guesses the color format of the texture
@@ -244,14 +244,14 @@ class gl_texture : public virtual image_stack&lt;T, F&gt;
 		///@param z size of the voxel in z direction
 		///	Sets the dimenstions of the voxels.
 		void setSpacing(float sx, float sy, float sz){
-			S[1] = sx;
-			S[2] = sy;
-			S[3] = sz;
+			grid<T, 4, F>::S[1] = sx;
+			grid<T, 4, F>::S[2] = sy;
+			grid<T, 4, F>::S[3] = sz;
 		}
 		///Returns a stim::vec that contains the x, y, z sizes of the voxel.
 		vec<float> getDims(){
-			vec<float> dims(S[1], S[2], S[3]);
+			vec<float> dims(grid<T, 4, F>::S[1], grid<T, 4, F>::S[2], grid<T, 4, F>::S[3]);
 			return dims;
 		}	
@@ -206,7 +206,7 @@ public:
 		result<<"]"<<std::endl;
 		//calculate the number of values to output
-		unsigned long nV = min((unsigned long long)R[0], (unsigned long long)10);
+		unsigned long nV = std::min((unsigned long long)R[0], (unsigned long long)10);
 		for(unsigned long v = 0; v<nV; v++){
 			result<<ptr[v];
@@ -121,10 +121,10 @@ public:
 	void
 	set_dim(float x, float y, float z)
 	{
-		S[0] = 1;
-		S[1] = x;
-		S[2] = y;
-		S[3] = z;
+		grid<T, 4, F>::S[0] = 1;
+		grid<T, 4, F>::S[1] = x;
+		grid<T, 4, F>::S[2] = y;
+		grid<T, 4, F>::S[3] = z;
 	}
 	///set dimensions of the grid.
@@ -110,11 +110,11 @@ protected:
 			unix_dir = unix_dir.substr(2, unix_dir.length()-2);	//extract the directory structure
 		}
-		if(unix_dir.front() == '/'){						//if there is a leading slash
+		if(unix_dir[0] == '/'){						//if there is a leading slash
 			relative = false;								//the path is not relative
 			unix_dir = unix_dir.substr(1, unix_dir.length() - 1);	//remove the slash
 		}
-		if(unix_dir.back() == '/')
+		if(unix_dir[unix_dir.size()-1] == '/')
 			unix_dir = unix_dir.substr(0, unix_dir.length() - 1);
 		path = stim::parser::split(unix_dir, '/');					//split up the directory structure