Blame view

stim/image/image.h 9.79 KB
d32a1854   David Mayerich   added framework f...
1
2
  #ifndef STIM_IMAGE_H
  #define STIM_IMAGE_H
fbf0ab02   David Mayerich   added support for...
3
  
c8c976a9   David Mayerich   replaced CImg wit...
4
5
  #include <opencv2/core/core.hpp>
  #include <opencv2/highgui/highgui.hpp>
912d9073   David Mayerich   added vector.h to...
6
  #include <vector>
d32a1854   David Mayerich   added framework f...
7
  #include <iostream>
a2bf1d08   David Mayerich   general bug fixes...
8
  #include <limits>
6d30a707   Tianshu Cheng   add cuda/array_ad...
9
  
7b3948ab   David Mayerich   added support for...
10
  namespace stim{
c8c976a9   David Mayerich   replaced CImg wit...
11
12
  /// This static class provides the STIM interface for loading, saving, and storing 2D images.
  /// Data is stored in an interleaved (BIP) format (default for saving and loading is RGB).
d32a1854   David Mayerich   added framework f...
13
14
15
16
17
18
  
  //currently this interface uses CImg
  //	T = data type (usually unsigned char)
  template <class T>
  class image{
  
c8c976a9   David Mayerich   replaced CImg wit...
19
20
21
22
  	//cimg_library::CImg<T> img;
  	T* img;										//pointer to the image data (assumes RGB for loading/saving)
  	size_t R[3];
  
a2bf1d08   David Mayerich   general bug fixes...
23
24
25
  	size_t X() const { return R[1]; }
  	size_t Y() const { return R[2]; }
  	size_t C() const { return R[0]; }
c8c976a9   David Mayerich   replaced CImg wit...
26
  
c8c976a9   David Mayerich   replaced CImg wit...
27
28
29
30
31
32
33
  	void init(){								//initializes all variables, assumes no memory is allocated
  		memset(R, 0, sizeof(size_t) * 3);		//set the resolution and number of channels to zero
  		img = NULL;
  	}
  
  	void unalloc(){								//frees any resources associated with the image
  		if(img)	free(img);						//if memory has been allocated, free it
c8c976a9   David Mayerich   replaced CImg wit...
34
  	}
1a224b6a   David Mayerich   fixed linux compa...
35
  
c8c976a9   David Mayerich   replaced CImg wit...
36
37
38
39
40
41
42
  
  	void clear(){								//clears all image data
  		unalloc();								//unallocate previous memory
  		init();									//re-initialize the variables
  	}
  
  	void allocate(){
e9a1b974   Pavel Govyadinov   imlemented Dr. Ma...
43
  		unalloc();
814eb271   David Mayerich   fixed problems wi...
44
  		img = (T*) malloc( sizeof(T) * R[0] * R[1] * R[2] );	//allocate memory
c8c976a9   David Mayerich   replaced CImg wit...
45
46
47
  	}
  
  	void allocate(size_t x, size_t y, size_t c){	//allocate memory based on the resolution
c8c976a9   David Mayerich   replaced CImg wit...
48
49
50
51
  		R[0] = c; R[1] = x; R[2] = y;				//set the resolution
  		allocate();									//allocate memory
  	}
  
814eb271   David Mayerich   fixed problems wi...
52
  	size_t bytes(){ return size() * sizeof(T); }
c8c976a9   David Mayerich   replaced CImg wit...
53
54
55
56
  
  	size_t idx(size_t x, size_t y, size_t c = 0){
  		return y * C() * X() + x * C() + c;
  	}
1a224b6a   David Mayerich   fixed linux compa...
57
  
c8c976a9   David Mayerich   replaced CImg wit...
58
59
  
  	int cv_type(){
814eb271   David Mayerich   fixed problems wi...
60
  		if(std::is_same<T, unsigned char>::value)	return CV_MAKETYPE(CV_8U, (int)C());
9339fbad   David Mayerich   implementing mie ...
61
62
63
64
65
66
  		else if(std::is_same<T, char>::value)			return CV_MAKETYPE(CV_8S, (int)C());
  		else if(std::is_same<T, unsigned short>::value)	return CV_MAKETYPE(CV_16U, (int)C());
  		else if(std::is_same<T, short>::value)			return CV_MAKETYPE(CV_16S, (int)C());
  		else if(std::is_same<T, int>::value)				return CV_MAKETYPE(CV_32S, (int)C());
  		else if(std::is_same<T, float>::value)			return CV_MAKETYPE(CV_32F, (int)C());
  		else if(std::is_same<T, double>::value)			return CV_MAKETYPE(CV_64F, (int)C());
1a224b6a   David Mayerich   fixed linux compa...
67
  
c8c976a9   David Mayerich   replaced CImg wit...
68
  		std::cout<<"ERROR in stim::image::cv_type - no valid data type found"<<std::endl;
3ff136b3   David Mayerich   replaced C++11 co...
69
  		exit(1);
c8c976a9   David Mayerich   replaced CImg wit...
70
71
  	}
  
a2bf1d08   David Mayerich   general bug fixes...
72
73
  	/// Returns the value for "white" based on the dynamic range (assumes white is 1.0 for floating point images)
  	T white(){
814eb271   David Mayerich   fixed problems wi...
74
  		if(std::is_same<T, unsigned char>::value)		return UCHAR_MAX;
9339fbad   David Mayerich   implementing mie ...
75
76
77
78
79
80
  		else if(std::is_same<T, unsigned short>::value)		return SHRT_MAX;
  		else if(std::is_same<T, unsigned>::value)			return UINT_MAX;
  		else if(std::is_same<T, unsigned long>::value)		return ULONG_MAX;
  		else if(std::is_same<T, unsigned long long>::value)	return ULLONG_MAX;
  		else if(std::is_same<T, float>::value)				return 1.0f;
  		else if(std::is_same<T, double>::value)				return 1.0;
a2bf1d08   David Mayerich   general bug fixes...
81
82
  
  		std::cout<<"ERROR in stim::image::white - no white value known for this data type"<<std::endl;
814eb271   David Mayerich   fixed problems wi...
83
  
a2bf1d08   David Mayerich   general bug fixes...
84
85
  	}
  
d32a1854   David Mayerich   added framework f...
86
87
88
  
  public:
  
a2bf1d08   David Mayerich   general bug fixes...
89
  	/// Default constructor - creates an empty image object
814eb271   David Mayerich   fixed problems wi...
90
  	image(){ init(); }							//initialize all variables to zero, don't allocate any memory
7b3948ab   David Mayerich   added support for...
91
  
a2bf1d08   David Mayerich   general bug fixes...
92
  	/// Constructor with a filename - loads the specified file
c8c976a9   David Mayerich   replaced CImg wit...
93
  	image(std::string filename){				//constructor initialize the image with an image file
fba6e7e3   Pavel Govyadinov   fixed image.h bug...
94
  		init();
c8c976a9   David Mayerich   replaced CImg wit...
95
  		load(filename);
7b3948ab   David Mayerich   added support for...
96
97
  	}
  
c8c976a9   David Mayerich   replaced CImg wit...
98
  	/// Create a new image from scratch given a number of samples and channels
1a224b6a   David Mayerich   fixed linux compa...
99
  	image(size_t x, size_t y = 1, size_t c = 1){
e9a1b974   Pavel Govyadinov   imlemented Dr. Ma...
100
  		init();
a2bf1d08   David Mayerich   general bug fixes...
101
  		allocate(x, y, c);
c8c976a9   David Mayerich   replaced CImg wit...
102
  	}
f186dbda   Tianshu Cheng   header file for b...
103
  
a2bf1d08   David Mayerich   general bug fixes...
104
  	/// Create a new image with the data given in 'data'
c8c976a9   David Mayerich   replaced CImg wit...
105
  	image(T* data, size_t x, size_t y, size_t c = 1){
e9a1b974   Pavel Govyadinov   imlemented Dr. Ma...
106
  		init();
c8c976a9   David Mayerich   replaced CImg wit...
107
108
  		allocate(x, y, c);
  		memcpy(img, data, bytes());
41acaf5d   David Mayerich   added a CUDA Gaus...
109
110
  	}
  
a2bf1d08   David Mayerich   general bug fixes...
111
  	/// Copy constructor - duplicates an image object
814eb271   David Mayerich   fixed problems wi...
112
  	image(const stim::image<T>& I){
e9a1b974   Pavel Govyadinov   imlemented Dr. Ma...
113
  		init();
a2bf1d08   David Mayerich   general bug fixes...
114
  		allocate(I.X(), I.Y(), I.C());
a2bf1d08   David Mayerich   general bug fixes...
115
116
117
118
119
120
121
122
  		memcpy(img, I.img, bytes());
  	}
  
  	/// Destructor - clear memory
  	~image(){
  		free(img);
  	}
  
735a2a24   David Mayerich   started testing o...
123
  	stim::image<T>& operator=(const stim::image<T>& I){
814eb271   David Mayerich   fixed problems wi...
124
  		init();
a2bf1d08   David Mayerich   general bug fixes...
125
126
127
128
129
130
131
  		if(&I == this)									//handle self-assignment
  			return *this;
  		allocate(I.X(), I.Y(), I.C());
  		memcpy(img, I.img, bytes());
  		return *this;
  	}
  
c8c976a9   David Mayerich   replaced CImg wit...
132
  	/// Load an image from a file
d32a1854   David Mayerich   added framework f...
133
  	void load(std::string filename){
c8c976a9   David Mayerich   replaced CImg wit...
134
135
  
  		cv::Mat cvImage = cv::imread(filename, CV_LOAD_IMAGE_UNCHANGED);	//use OpenCV to open the image file
a2bf1d08   David Mayerich   general bug fixes...
136
  		if(!cvImage.data){
814eb271   David Mayerich   fixed problems wi...
137
  			std::cout<<"ERROR stim::image::load() - unable to find image "<<filename<<std::endl;
a2bf1d08   David Mayerich   general bug fixes...
138
139
  			exit(1);
  		}
c8c976a9   David Mayerich   replaced CImg wit...
140
  		allocate(cvImage.cols, cvImage.rows, cvImage.channels());			//allocate space for the image
814eb271   David Mayerich   fixed problems wi...
141
142
143
144
  		T* cv_ptr = (T*)cvImage.data;
  		if(C() == 1)														//if this is a single-color image, just copy the data
  			memcpy(img, cv_ptr, bytes());
  		if(C() == 3)														//if this is a 3-color image, OpenCV uses BGR interleaving
a2bf1d08   David Mayerich   general bug fixes...
145
  			set_interleaved_bgr(cv_ptr, X(), Y());
d32a1854   David Mayerich   added framework f...
146
147
148
149
  	}
  
  	//save a file
  	void save(std::string filename){
c8c976a9   David Mayerich   replaced CImg wit...
150
151
  		//OpenCV uses an interleaved format, so convert first and then output
  		T* buffer = (T*) malloc(bytes());
a2bf1d08   David Mayerich   general bug fixes...
152
153
154
155
  
  		if(C() == 1)
  			memcpy(buffer, img, bytes());
  		else if(C() == 3)
9b766f1f   Pavel Govyadinov   completed merge f...
156
  			get_interleaved_bgr(buffer);
c8c976a9   David Mayerich   replaced CImg wit...
157
158
  		cv::Mat cvImage((int)Y(), (int)X(), cv_type(), buffer);
  		cv::imwrite(filename, cvImage);
d32a1854   David Mayerich   added framework f...
159
160
  	}
  
8b7be670   David Mayerich   implemented savin...
161
  	//create an image from an interleaved buffer
814eb271   David Mayerich   fixed problems wi...
162
163
  	void set_interleaved_rgb(T* buffer, size_t width, size_t height){
  		allocate(width, height, 3);
c8c976a9   David Mayerich   replaced CImg wit...
164
165
  		memcpy(img, buffer, bytes());
  	}
fbf0ab02   David Mayerich   added support for...
166
  
814eb271   David Mayerich   fixed problems wi...
167
168
  	void set_interleaved_bgr(T* buffer, size_t width, size_t height){
  		allocate(width, height, 3);
c8c976a9   David Mayerich   replaced CImg wit...
169
170
171
172
173
  		for(size_t c = 0; c < C(); c++){								//copy directly
  			for(size_t y = 0; y < Y(); y++){
  				for(size_t x = 0; x < X(); x++){
  					img[idx(x, y, c)] = buffer[y * X() * C() + x * C() + (2-c)];
  				}
fbf0ab02   David Mayerich   added support for...
174
175
  			}
  		}
8b7be670   David Mayerich   implemented savin...
176
177
  	}
  
9b766f1f   Pavel Govyadinov   completed merge f...
178
  	void get_interleaved_bgr(T* data){
8b7be670   David Mayerich   implemented savin...
179
180
  
  		//for each channel
c8c976a9   David Mayerich   replaced CImg wit...
181
182
183
184
185
186
187
  		for(size_t y = 0; y < Y(); y++){
  			for(size_t x = 0; x < X(); x++){
  				for(size_t c = 0; c < C(); c++){
  					data[y * X() * C() + x * C() + (2-c)] = img[idx(x, y, c)];
  				}
  			}
  		}
8b7be670   David Mayerich   implemented savin...
188
189
  	}
  
9b766f1f   Pavel Govyadinov   completed merge f...
190
191
192
193
  	void get_interleaved_rgb(T* data){
  		memcpy(data, img, bytes());
  	}
  
904614c3   David Mayerich   added normalizati...
194
195
196
197
198
199
200
201
202
203
204
205
  	//copies data in the given channel order as a non-interleaved image
  	void get_noninterleaved(T* data){
  		//for each channel
  		for(size_t y = 0; y < Y(); y++){
  			for(size_t x = 0; x < X(); x++){
  				for(size_t c = 0; c < C(); c++){
  					data[c * Y() * X() + y * X() + x] = img[idx(x, y, c)];
  				}
  			}
  		}
  	}
  
9b766f1f   Pavel Govyadinov   completed merge f...
206
  
9d3ba0b1   David Mayerich   added stim::hsi a...
207
  	image<T> channel(size_t c){
41acaf5d   David Mayerich   added a CUDA Gaus...
208
209
  
  		//create a new image
a2bf1d08   David Mayerich   general bug fixes...
210
  		image<T> r(X(), Y(), 1);
41acaf5d   David Mayerich   added a CUDA Gaus...
211
  
c8c976a9   David Mayerich   replaced CImg wit...
212
213
  		for(size_t x = 0; x < X(); x++){
  			for(size_t y = 0; y < Y(); y++){
8e2fb2b4   David Mayerich   fixed a segmentat...
214
  				r.img[r.idx(x, y, 0)] = img[idx(x, y, c)];
c8c976a9   David Mayerich   replaced CImg wit...
215
216
  			}
  		}
41acaf5d   David Mayerich   added a CUDA Gaus...
217
  
c8c976a9   David Mayerich   replaced CImg wit...
218
  		return r;
41acaf5d   David Mayerich   added a CUDA Gaus...
219
220
221
  
  	}
  
c8c976a9   David Mayerich   replaced CImg wit...
222
223
  	T& operator()(size_t x, size_t y, size_t c = 0){
  		return img[idx(x, y, c)];
3d0b6243   David Mayerich   fixed hsiproc bug...
224
225
226
227
228
229
230
  	}
  
  	/// Set all elements in the image to a given scalar value
  
  	/// @param v is the value used to set all values in the image
  	image<T> operator=(T v){
  
c8c976a9   David Mayerich   replaced CImg wit...
231
  		size_t N = size();
3d0b6243   David Mayerich   fixed hsiproc bug...
232
  
c8c976a9   David Mayerich   replaced CImg wit...
233
234
  		for(size_t n = 0; n < N; n++)
  			img[n] = v;
3d0b6243   David Mayerich   fixed hsiproc bug...
235
236
237
238
239
  
  		return *this;
  
  	}
  
f186dbda   Tianshu Cheng   header file for b...
240
241
242
243
244
  	/// Copy the given data to the specified channel
  
  	/// @param c is the channel number that the data will be copied to
  	/// @param buffer is a pointer to the image to be copied to channel c
  
c8c976a9   David Mayerich   replaced CImg wit...
245
  	void set_channel(T* buffer, size_t c){
6d30a707   Tianshu Cheng   add cuda/array_ad...
246
  
c8c976a9   David Mayerich   replaced CImg wit...
247
248
249
250
251
252
  		size_t x, y;
  		for(y = 0; y < Y(); y++){
  			for(x = 0; x < X(); x++){
  				img[idx(x, y, c)] = buffer[c];
  			}
  		}
6d30a707   Tianshu Cheng   add cuda/array_ad...
253
254
  	}
  
9d3ba0b1   David Mayerich   added stim::hsi a...
255
  	size_t channels(){
c8c976a9   David Mayerich   replaced CImg wit...
256
  		return C();
8b7be670   David Mayerich   implemented savin...
257
258
  	}
  
9d3ba0b1   David Mayerich   added stim::hsi a...
259
  	size_t width(){
c8c976a9   David Mayerich   replaced CImg wit...
260
  		return X();
8b7be670   David Mayerich   implemented savin...
261
262
  	}
  
9d3ba0b1   David Mayerich   added stim::hsi a...
263
  	size_t height(){
c8c976a9   David Mayerich   replaced CImg wit...
264
  		return Y();
3d0b6243   David Mayerich   fixed hsiproc bug...
265
266
  	}
  
6d30a707   Tianshu Cheng   add cuda/array_ad...
267
  	T* data(){
c8c976a9   David Mayerich   replaced CImg wit...
268
  		return img;
6d30a707   Tianshu Cheng   add cuda/array_ad...
269
270
  	}
  
7b3948ab   David Mayerich   added support for...
271
  	//returns the size (number of values) of the image
c8c976a9   David Mayerich   replaced CImg wit...
272
  	size_t size(){ return C() * X() * Y(); }
d32a1854   David Mayerich   added framework f...
273
  
faef7718   David Mayerich   updates to stim::...
274
  	/// Returns the number of nonzero values
9d3ba0b1   David Mayerich   added stim::hsi a...
275
  	size_t nnz(){
faef7718   David Mayerich   updates to stim::...
276
  
c8c976a9   David Mayerich   replaced CImg wit...
277
  		size_t N = X() * Y() * C();
faef7718   David Mayerich   updates to stim::...
278
  
c8c976a9   David Mayerich   replaced CImg wit...
279
280
281
  		size_t nz = 0;
  		for(size_t n = 0; n < N; n++)
  			if(img[n] != 0) nz++;
faef7718   David Mayerich   updates to stim::...
282
  
c8c976a9   David Mayerich   replaced CImg wit...
283
  		return nz;	//return the number of nonzero pixels
faef7718   David Mayerich   updates to stim::...
284
285
286
287
  
  	}
  
  	//this function returns indices of pixels that have nonzero values
9d3ba0b1   David Mayerich   added stim::hsi a...
288
  	std::vector<size_t> sparse_idx(){
faef7718   David Mayerich   updates to stim::...
289
  
c8c976a9   David Mayerich   replaced CImg wit...
290
  		std::vector<size_t> s;				//allocate an array
faef7718   David Mayerich   updates to stim::...
291
292
  		s.resize(nnz());					//allocate space in the array
  
c8c976a9   David Mayerich   replaced CImg wit...
293
294
  		size_t N = size();
  		//size_t C = channels();
faef7718   David Mayerich   updates to stim::...
295
  
c8c976a9   David Mayerich   replaced CImg wit...
296
  		//T* ptr = img.data();				//get a pointer to the image data
faef7718   David Mayerich   updates to stim::...
297
  
9d3ba0b1   David Mayerich   added stim::hsi a...
298
  		size_t i = 0;
c8c976a9   David Mayerich   replaced CImg wit...
299
300
301
302
  		for(size_t n = 0; n < N; n++){
  			if(img[n] != 0){
  				s[i] = n;
  				i++;
faef7718   David Mayerich   updates to stim::...
303
304
305
306
307
  			}
  		}
  
  		return s;			//return the index list
  	}
6d30a707   Tianshu Cheng   add cuda/array_ad...
308
  
1a224b6a   David Mayerich   fixed linux compa...
309
  
6d30a707   Tianshu Cheng   add cuda/array_ad...
310
  	/// Returns the maximum pixel value in the image
96f9b10f   Laila Saadatifard   change the header...
311
  	T maxv(){
c8c976a9   David Mayerich   replaced CImg wit...
312
313
  		T max_val = img[0];				//initialize the maximum value to the first one
  		size_t N = size();	//get the number of pixels
6d30a707   Tianshu Cheng   add cuda/array_ad...
314
  
c8c976a9   David Mayerich   replaced CImg wit...
315
  		for (size_t n=0; n<N; n++){		//for every value
6d30a707   Tianshu Cheng   add cuda/array_ad...
316
  
c8c976a9   David Mayerich   replaced CImg wit...
317
318
  			if (img[n] > max_val){			//if the value is higher than the current max
  				max_val = img[n];
1a224b6a   David Mayerich   fixed linux compa...
319
  			}
6d30a707   Tianshu Cheng   add cuda/array_ad...
320
321
  		}
  
1a224b6a   David Mayerich   fixed linux compa...
322
  		return max_val;
6d30a707   Tianshu Cheng   add cuda/array_ad...
323
  	}
d32a1854   David Mayerich   added framework f...
324
  
c8c976a9   David Mayerich   replaced CImg wit...
325
  	/// Returns the maximum pixel value in the image
96f9b10f   Laila Saadatifard   change the header...
326
  	T minv(){
c8c976a9   David Mayerich   replaced CImg wit...
327
328
  		T min_val = img[0];				//initialize the maximum value to the first one
  		size_t N = size();	//get the number of pixels
6d30a707   Tianshu Cheng   add cuda/array_ad...
329
  
c8c976a9   David Mayerich   replaced CImg wit...
330
331
332
  		for (size_t n=0; n<N; n++){		//for every value
  			if (img[n] < min_val){			//if the value is higher than the current max
  				min_val = img[n];
1a224b6a   David Mayerich   fixed linux compa...
333
  			}
6d30a707   Tianshu Cheng   add cuda/array_ad...
334
335
  		}
  
1a224b6a   David Mayerich   fixed linux compa...
336
  		return min_val;
6d30a707   Tianshu Cheng   add cuda/array_ad...
337
338
  	}
  
a2bf1d08   David Mayerich   general bug fixes...
339
340
341
342
343
344
  	/// Invert an image by calculating I1 = alpha - I0, where alpha is the maximum image value
  	image<T> invert(T white_val){
  		size_t N = size();						//calculate the total number of values in the image
  		image<T> r(X(), Y(), C());				//allocate space for the resulting image
  		for(size_t n = 0; n < N; n++)
  			r.img[n] = white_val - img[n];		//perform the inversion
1a224b6a   David Mayerich   fixed linux compa...
345
  
a2bf1d08   David Mayerich   general bug fixes...
346
347
  		return r;								//return the inverted image
  	}
a2bf1d08   David Mayerich   general bug fixes...
348
  
6d30a707   Tianshu Cheng   add cuda/array_ad...
349
  	image<T> srgb2lab(){
c8c976a9   David Mayerich   replaced CImg wit...
350
351
  		std::cout<<"ERROR stim::image::srgb2lab - function has been broken, re-implement."<<std::endl;
  		exit(1);
6d30a707   Tianshu Cheng   add cuda/array_ad...
352
353
354
  	}
  
  	image<T> convolve2(image<T> mask){
1a224b6a   David Mayerich   fixed linux compa...
355
  
c8c976a9   David Mayerich   replaced CImg wit...
356
357
  		std::cout<<"ERROR stim::image::convolve2 - function has been broken, and shouldn't really be in here."<<std::endl;
  		exit(1);
6d30a707   Tianshu Cheng   add cuda/array_ad...
358
  	}
d32a1854   David Mayerich   added framework f...
359
360
  
  
f186dbda   Tianshu Cheng   header file for b...
361
  	image<T> rotate(float angle, float cx, float cy){
c8c976a9   David Mayerich   replaced CImg wit...
362
363
  		std::cout<<"ERROR stim::image::rotate - function has been broken, and shouldn't really be in here."<<std::endl;
  		exit(1);
f186dbda   Tianshu Cheng   header file for b...
364
  	}
945ee13c   Laila Saadatifard   the get_list func...
365
  
945ee13c   Laila Saadatifard   the get_list func...
366
367
  	// leila's code for non_interleaving data in 3D
  	//create an data set from an interleaved buffer
9d3ba0b1   David Mayerich   added stim::hsi a...
368
  	void set_interleaved3(T* buffer, size_t width, size_t height, size_t depth, size_t channels = 3){
c8c976a9   David Mayerich   replaced CImg wit...
369
370
  		std::cout<<"ERROR stim::image::set_interleaved3 - stim::image no longer supports 3D images."<<std::endl;
  		exit(1);
945ee13c   Laila Saadatifard   the get_list func...
371
  	}
1a224b6a   David Mayerich   fixed linux compa...
372
  
d32a1854   David Mayerich   added framework f...
373
374
  };
  
7b3948ab   David Mayerich   added support for...
375
376
  };		//end namespace stim
  
d32a1854   David Mayerich   added framework f...
377
378
  
  #endif