fixed compiler errors related to NetMets

David Mayerich
1 parent 470ab611
Showing 3 changed files with 5 additions and 1 deletions Show diff stats
stim/grids/image_stack.h
stim/image/image.h
stim/visualization/gl_network.h
@@ -206,9 +206,12 @@ public:
 	}
  
  
+	/* This was causing compiler errors. I don't think this function call exists anywhere:
+
 	void read(std::string file, unsigned int X, unsigned int Y, unsigned int Z, unsigned int C = 1, unsigned int header = 0){
 		read(file, stim::vec<unsigned long>(C, X, Y, Z), header);
 	}
+	*/
  
 	T* data(){
 		return ptr;
@@ -653,7 +653,7 @@ public:
  
 	//crop regions given by an array of 1D index values
 	std::vector< image<T> > crop_idx(size_t w, size_t h, std::vector<size_t> idx) {
-		std::vector<image<T>> result(idx.size());										//create an array of image files to return
+		std::vector< image<T> > result(idx.size());										//create an array of image files to return
 		for (size_t i = 0; i < idx.size(); i++) {										//for each specified index point
 			size_t y = idx[i] / X();													//calculate the y coordinate from the 1D index (center of ROI)
 			size_t x = idx[i] - y * X();												//calculate the x coordinate (center of ROI)
 #ifndef STIM_GL_NETWORK
 #define STIM_GL_NETWORK
  
+#include <GL/glut.h>
 #include <stim/biomodels/network.h>
 #include <stim/visualization/aaboundingbox.h>