diff --git a/stim/grids/image_stack.h b/stim/grids/image_stack.h index 5a6fccd..536434d 100644 --- a/stim/grids/image_stack.h +++ b/stim/grids/image_stack.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(C, X, Y, Z), header); } + */ T* data(){ return ptr; diff --git a/stim/image/image.h b/stim/image/image.h index cd88de2..a471525 100644 --- a/stim/image/image.h +++ b/stim/image/image.h @@ -653,7 +653,7 @@ public: //crop regions given by an array of 1D index values std::vector< image > crop_idx(size_t w, size_t h, std::vector idx) { - std::vector> result(idx.size()); //create an array of image files to return + std::vector< image > 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) diff --git a/stim/visualization/gl_network.h b/stim/visualization/gl_network.h index 8761c58..4f22d72 100644 --- a/stim/visualization/gl_network.h +++ b/stim/visualization/gl_network.h @@ -1,6 +1,7 @@ #ifndef STIM_GL_NETWORK #define STIM_GL_NETWORK +#include #include #include -- libgit2 0.21.4