fixed image stack loading errors in gl_texture

david
1 parent c512fb94
Showing 2 changed files with 15 additions and 4 deletions Show diff stats
stim/gl/gl_texture.h
stim/grids/image_stack.h
@@ -210,14 +210,25 @@ class gl_texture : public virtual image_stack&lt;T, F&gt;
 			wrap = twrap;										//store the wrap type
 		}
  
-		///@param string path to the directory with the image files.
-		///Creates an instance of the gl_texture object with a path to the data.
+		///@param is a mask indicating the files to load
+		///Creates an instance of the gl_texture object and initializes it with a file list
  
 		gl_texture(std::string file_mask, GLint interp = GL_LINEAR, GLint twrap = GL_REPEAT){
 			init();
 			interpolation = interp;								//store interpolation type
 			wrap = twrap;										//store wrap type
-			load(file_mask);
+			load_images(file_mask);
+		}
+
+		///Creates an instance of gl_texture and initializes with a file list
+		///@param file_list is a list of files
+		///@param interp is the type of texture interpolation (GL_LINEAR, GL_NEAREST)
+		///@param twrap is the type of texture wrapping
+		gl_texture(std::vector<std::string> file_list, GLint interp = GL_LINEAR, GLint twrap = GL_REPEAT){
+			init();
+			interpolation = interp;
+			wrap = twrap;
+			load_images(file_list);
 		}
  
 		///Attaches the texture to the current OpenGL context and makes it ready to render
@@ -80,7 +80,7 @@ public:
 		R[2] = I.height();
 		R[3] = string_list.size();			//set the stack z-resolution based on the number of images
  
-		ptr = (T*)malloc(bytes());	//allocate storage space
+		ptr = (T*)malloc(grid<T, 4, F>::bytes());	//allocate storage space
  
 		//load and copy each image into the grid
 		for(unsigned int i = 0; i<R[3]; i++){				//for each image in the list