Commit 0012d210b79f6a8bf6210265e8c20d6cd2fd468a

Authored by David Mayerich
1 parent 470ab611

fixed compiler errors related to NetMets

stim/grids/image_stack.h
@@ -206,9 +206,12 @@ public: @@ -206,9 +206,12 @@ public:
206 } 206 }
207 207
208 208
  209 + /* This was causing compiler errors. I don't think this function call exists anywhere:
  210 +
209 void read(std::string file, unsigned int X, unsigned int Y, unsigned int Z, unsigned int C = 1, unsigned int header = 0){ 211 void read(std::string file, unsigned int X, unsigned int Y, unsigned int Z, unsigned int C = 1, unsigned int header = 0){
210 read(file, stim::vec<unsigned long>(C, X, Y, Z), header); 212 read(file, stim::vec<unsigned long>(C, X, Y, Z), header);
211 } 213 }
  214 + */
212 215
213 T* data(){ 216 T* data(){
214 return ptr; 217 return ptr;
stim/image/image.h
@@ -653,7 +653,7 @@ public: @@ -653,7 +653,7 @@ public:
653 653
654 //crop regions given by an array of 1D index values 654 //crop regions given by an array of 1D index values
655 std::vector< image<T> > crop_idx(size_t w, size_t h, std::vector<size_t> idx) { 655 std::vector< image<T> > crop_idx(size_t w, size_t h, std::vector<size_t> idx) {
656 - std::vector<image<T>> result(idx.size()); //create an array of image files to return 656 + std::vector< image<T> > result(idx.size()); //create an array of image files to return
657 for (size_t i = 0; i < idx.size(); i++) { //for each specified index point 657 for (size_t i = 0; i < idx.size(); i++) { //for each specified index point
658 size_t y = idx[i] / X(); //calculate the y coordinate from the 1D index (center of ROI) 658 size_t y = idx[i] / X(); //calculate the y coordinate from the 1D index (center of ROI)
659 size_t x = idx[i] - y * X(); //calculate the x coordinate (center of ROI) 659 size_t x = idx[i] - y * X(); //calculate the x coordinate (center of ROI)
stim/visualization/gl_network.h
1 #ifndef STIM_GL_NETWORK 1 #ifndef STIM_GL_NETWORK
2 #define STIM_GL_NETWORK 2 #define STIM_GL_NETWORK
3 3
  4 +#include <GL/glut.h>
4 #include <stim/biomodels/network.h> 5 #include <stim/biomodels/network.h>
5 #include <stim/visualization/aaboundingbox.h> 6 #include <stim/visualization/aaboundingbox.h>
6 7