add cuda/array_add.cuh

Tianshu Cheng
1 parent 13fe3c84
Showing 3 changed files with 73 additions and 3 deletions Show diff stats
stim/cuda/arraymath.cuh
stim/cuda/gaussian_blur.cuh
stim/image/image.h
 #ifndef STIM_CUDA_ARRAYMATH_H
 #define STIM_CUDA_ARRAYMATH_H
  
+#include <stim/cuda/array_add.cuh>
 #include <stim/cuda/array_multiply.cuh>
 #include <stim/cuda/array_abs.cuh>
 #include <stim/cuda/array_cart2polar.cuh>
@@ -237,7 +237,7 @@ namespace stim{
 			cudaFree(gpuI0);
 		}
  
-	}
-}
+	};
+};
  
 #endif
 \ No newline at end of file
@@ -7,6 +7,7 @@
  
 #include <vector>
 #include <iostream>
+
 namespace stim{
 //This static class provides the STIM interface for loading images
 //	Use this interface for all image management - that way the actual library can be changed without problems
@@ -83,12 +84,23 @@ public:
 		//create a new image
 		image<T> single;
  
-		single.img = img.channel(c);
+		single.img = img.get_channel(c);
  
 		return single;
  
 	}
  
+	image<T> getslice(unsigned int c){
+
+		//create a new image
+		image<T> slice;
+
+		slice.img = img.get_slice(c);
+
+		return slice;
+
+	}
+
 	unsigned int channels(){
 		return (unsigned int)img.spectrum();
 	}
@@ -101,6 +113,10 @@ public:
 		return img.height();
 	}
  
+	T* data(){
+		return img.data();
+	}
+
 	//returns the size (number of values) of the image
 	unsigned long size(){
 		return img.size();
@@ -155,8 +171,61 @@ public:
  
 		return s;			//return the index list
 	}
+
  
+	/// Returns the maximum pixel value in the image
+	T max(){
+		float max = 0;
+		unsigned long N = width() * height();		//get the number of pixels
+
+		for (unsigned long i=0; i<N; i++){
+
+			if (img.data()[i] > max)
+			{
+				max = img.data()[i];
+			}	
+		}
+
+		return max;	
+	}
  
+	/// Returns the minimum pixel value in the image
+	T min(){
+		float min = 0;
+		unsigned long N = width() * height();		//get the number of pixels
+
+		for (unsigned long i=0; i<N; i++){
+
+			if (img.data()[i] < min)
+			{
+				min = img.data()[i];
+			}	
+		}
+
+		return min;	
+
+	}
+
+	image<T> srgb2lab(){
+
+		image<T> rgb;
+		rgb.img = img.get_sRGBtoRGB();
+
+		image<T> lab;
+		lab.img = rgb.img.get_RGBtoLab();
+
+		return lab;
+
+	}
+
+	image<T> convolve2(image<T> mask){
+		
+		image<T> result;
+
+		result.img = img.get_convolve(mask.img);
+
+		return result;
+	}
  
  
 };