ivote updates

David Mayerich
1 parent cc42ca92
Showing 2 changed files with 14 additions and 6 deletions Show diff stats
stim/image/image.h
stim/math/filters/gauss2.cuh
@@ -54,8 +54,6 @@ class image{
 		allocate();									//allocate memory
 	}
-	size_t bytes(){ return size() * sizeof(T); }
-
 	inline size_t idx(size_t x, size_t y, size_t c = 0) const {
 		return y * R[0] * R[1] + x * R[0] + c;
 	}
@@ -82,6 +80,8 @@ class image{
 public:
+	size_t bytes() { return size() * sizeof(T); }
+
 	/// Default constructor - creates an empty image object
 	image(){ init(); }							//initialize all variables to zero, don't allocate any memory
@@ -116,7 +116,7 @@ public:
 		free(img);
 	}
-	///Resize an image
+	///Resize an image - this function looks like it hasn't been implemented
 	void resize(size_t x, size_t y, size_t c = 1) {
 		allocate(x, y, c);
 	}
@@ -384,6 +384,15 @@ public:
 	}
+	/// invert the image, given a specified maximum value (ex. maxval = 255, I' = 255 - I)
+	/*image<T> invert(T maxval) {
+		image<T> result(width(), height(), channels());		//create a new image
+		size_t N = size();									//get the number of elements in the image
+		for (size_t n = 0; n < N; n++)
+			result.data()[n] = maxval - img[n];				//perform the inversion and save the result to the new image
+		return result;
+	}*/
+
 	/// Stretch the contrast of the image such that the minimum and maximum intensity match the given values
 	image<T> stretch(T low, T high) {
 		T maxval = maxv();
@@ -540,7 +549,6 @@ public:
 	}
 	image<T> convolve2(image<T> mask){
-
 		std::cout<<"ERROR stim::image::convolve2 - function has been broken, and shouldn't really be in here."<<std::endl;
 		exit(1);
 	}
@@ -33,10 +33,10 @@ namespace stim {
 		for (size_t yi = 0; yi < ky; yi++)
 			gy[yi] = gauss1d((K)yi, muy, stdy);
-		std::vector< stim::image<T> > IN = in.split();	//split the input image into channels
+		std::vector< stim::image<T> > clist = in.split();	//split the input image into channels
 		std::vector< stim::image<T> > R = r.split();		//split the output image into channels
 		for (size_t c = 0; c < in.channels(); c++)		//for each channel
-			cpu_sepconv2(R[c].data(), IN[c].data(), gx, gy, IN[c].width(), IN[c].height(), kx, ky);
+			cpu_sepconv2(R[c].data(), clist[c].data(), gx, gy, clist[c].width(), clist[c].height(), kx, ky);
 		r.merge(R);										//merge the blurred channels into the final image
 		return r;