6aa04ba2
David Mayerich
interleave types
|
1
2
3
|
#ifndef STIM_BIL_H
#define STIM_BIL_H
|
e8eb202f
David Mayerich
added a new ENVI ...
|
4
|
#include "../envi/envi_header.h"
|
c25e7d0d
heziqi
speed of bip.base...
|
5
6
7
8
|
#include "../envi/binary.h"
#include <cstring>
#include <utility>
|
8a86bd56
David Mayerich
changed rts names...
|
9
|
namespace stim{
|
c25e7d0d
heziqi
speed of bip.base...
|
10
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
11
12
13
14
15
16
17
18
19
|
/**
The BIL class represents a 3-dimensional binary file stored using band interleaved by line (BIL) image encoding. The binary file is stored
such that X-Z "frames" are stored sequentially to form an image stack along the y-axis. When accessing the data sequentially on disk,
the dimensions read, from fastest to slowest, are X, Z, Y.
This class is optimized for data streaming, and therefore supports extremely large (terabyte-scale) files. Data is loaded from disk
on request. Functions used to access data are written to support efficient reading.
*/
|
c25e7d0d
heziqi
speed of bip.base...
|
20
21
22
23
24
25
|
template <typename T>
class bil: public binary<T> {
protected:
|
6708cc25
heziqi
Ziqi added envi c...
|
26
|
std::vector<double> w; //band wavelength
|
c25e7d0d
heziqi
speed of bip.base...
|
27
28
29
30
31
|
public:
using binary<T>::open;
using binary<T>::file;
|
6708cc25
heziqi
Ziqi added envi c...
|
32
|
using binary<T>::R;
|
c25e7d0d
heziqi
speed of bip.base...
|
33
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
34
35
36
37
38
39
40
41
|
/// Open a data file for reading using the class interface.
/// @param filename is the name of the binary file on disk
/// @param X is the number of samples along dimension 1
/// @param Y is the number of samples (lines) along dimension 2
/// @param B is the number of samples (bands) along dimension 3
/// @param header_offset is the number of bytes (if any) in the binary header
/// @param wavelengths is an optional STL vector of size B specifying a numerical label for each band
|
6708cc25
heziqi
Ziqi added envi c...
|
42
|
bool open(std::string filename, unsigned int X, unsigned int Y, unsigned int B, unsigned int header_offset, std::vector<double> wavelengths){
|
c25e7d0d
heziqi
speed of bip.base...
|
43
|
|
6708cc25
heziqi
Ziqi added envi c...
|
44
|
w = wavelengths;
|
c25e7d0d
heziqi
speed of bip.base...
|
45
|
|
6708cc25
heziqi
Ziqi added envi c...
|
46
47
|
return open(filename, vec<unsigned int>(X, Y, B), header_offset);
|
c25e7d0d
heziqi
speed of bip.base...
|
48
49
|
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
50
51
52
53
|
/// Retrieve a single band (based on index) and stores it in pre-allocated memory.
/// @param p is a pointer to an allocated region of memory at least X * Y * sizeof(T) in size.
/// @param page <= B is the integer number of the band to be copied.
|
c25e7d0d
heziqi
speed of bip.base...
|
54
55
|
bool band_index( T * p, unsigned int page){
|
6708cc25
heziqi
Ziqi added envi c...
|
56
57
|
unsigned int L = R[0] * sizeof(T); //caculate the number of bytes in a sample line
unsigned int jump = R[0] * (R[2] - 1) * sizeof(T);
|
c25e7d0d
heziqi
speed of bip.base...
|
58
|
|
6708cc25
heziqi
Ziqi added envi c...
|
59
|
if (page >= R[2]){ //make sure the bank number is right
|
c25e7d0d
heziqi
speed of bip.base...
|
60
61
62
63
|
std::cout<<"ERROR: page out of range"<<std::endl;
return false;
}
|
6708cc25
heziqi
Ziqi added envi c...
|
64
65
|
file.seekg(R[0] * page * sizeof(T), std::ios::beg);
for (unsigned i = 0; i < R[1]; i++)
|
c25e7d0d
heziqi
speed of bip.base...
|
66
|
{
|
6708cc25
heziqi
Ziqi added envi c...
|
67
|
file.read((char *)(p + i * R[0]), L);
|
c25e7d0d
heziqi
speed of bip.base...
|
68
69
70
71
72
73
|
file.seekg( jump, std::ios::cur);
}
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
74
75
76
77
|
/// Retrieve a single band (by numerical label) and stores it in pre-allocated memory.
/// @param p is a pointer to an allocated region of memory at least X * Y * sizeof(T) in size.
/// @param wavelength is a floating point value (usually a wavelength in spectral data) used as a label for the band to be copied.
|
e933c14e
David Mayerich
cleaned up the code
|
78
|
bool band( T * p, double wavelength){
|
c25e7d0d
heziqi
speed of bip.base...
|
79
|
|
ee4dea28
David Mayerich
fixed errors in c...
|
80
81
82
83
|
//if there are no wavelengths in the BSQ file
if(w.size() == 0)
return band_index(p, (unsigned int)wavelength);
|
6708cc25
heziqi
Ziqi added envi c...
|
84
|
unsigned int XY = R[0] * R[1]; //calculate the number of pixels in a band
|
c25e7d0d
heziqi
speed of bip.base...
|
85
86
87
|
unsigned int S = XY * sizeof(T); //calculate the number of bytes of a band
unsigned page=0; //bands around the wavelength
|
517876d6
heziqi
metrics finished ...
|
88
|
|
c25e7d0d
heziqi
speed of bip.base...
|
89
90
91
92
|
//get the bands numbers around the wavelength
//if wavelength is smaller than the first one in header file
|
6708cc25
heziqi
Ziqi added envi c...
|
93
|
if ( w[page] > wavelength ){
|
c25e7d0d
heziqi
speed of bip.base...
|
94
95
96
97
|
band_index(p, page);
return true;
}
|
6708cc25
heziqi
Ziqi added envi c...
|
98
|
while( w[page] < wavelength )
|
c25e7d0d
heziqi
speed of bip.base...
|
99
100
101
|
{
page++;
//if wavelength is larger than the last wavelength in header file
|
6708cc25
heziqi
Ziqi added envi c...
|
102
103
|
if (page == R[2]) {
band_index(p, R[2]-1);
|
c25e7d0d
heziqi
speed of bip.base...
|
104
105
106
|
return true;
}
}
|
6708cc25
heziqi
Ziqi added envi c...
|
107
|
if ( wavelength < w[page] )
|
c25e7d0d
heziqi
speed of bip.base...
|
108
|
{
|
517876d6
heziqi
metrics finished ...
|
109
110
|
T * p1;
T * p2;
|
c25e7d0d
heziqi
speed of bip.base...
|
111
112
113
114
115
|
p1=(T*)malloc(S); //memory allocation
p2=(T*)malloc(S);
band_index(p1, page - 1);
band_index(p2, page );
for(unsigned i=0; i < XY; i++){
|
6708cc25
heziqi
Ziqi added envi c...
|
116
|
double r = (double) (wavelength - w[page-1]) / (double) (w[page] - w[page-1]);
|
c25e7d0d
heziqi
speed of bip.base...
|
117
118
|
p[i] = (p2[i] - p1[i]) * r + p1[i];
}
|
517876d6
heziqi
metrics finished ...
|
119
120
|
free(p1);
free(p2);
|
c25e7d0d
heziqi
speed of bip.base...
|
121
122
123
124
125
126
127
128
129
130
131
132
|
}
else //if the wavelength is equal to a wavelength in header file
{
band_index(p, page);
}
return true;
}
//get YZ line from the a Y slice, Y slice data should be already IN the MEMORY
bool getYZ(T* p, T* c, double wavelength)
{
|
6708cc25
heziqi
Ziqi added envi c...
|
133
134
|
unsigned int X = R[0]; //calculate the number of pixels in a sample
unsigned int B = R[2];
|
c25e7d0d
heziqi
speed of bip.base...
|
135
136
137
138
139
140
141
142
143
|
unsigned int L = X * sizeof(T);
unsigned page=0; //samples around the wavelength
T * p1;
T * p2;
//get the bands numbers around the wavelength
//if wavelength is smaller than the first one in header file
|
6708cc25
heziqi
Ziqi added envi c...
|
144
|
if ( w[page] > wavelength ){
|
c25e7d0d
heziqi
speed of bip.base...
|
145
146
147
148
|
memcpy(p, c, L);
return true;
}
|
6708cc25
heziqi
Ziqi added envi c...
|
149
|
while( w[page] < wavelength )
|
c25e7d0d
heziqi
speed of bip.base...
|
150
151
152
153
154
155
156
157
|
{
page++;
//if wavelength is larger than the last wavelength in header file
if (page == B) {
memcpy(p, c + (B - 1) * X, L);
return true;
}
}
|
6708cc25
heziqi
Ziqi added envi c...
|
158
|
if ( wavelength < w[page] )
|
c25e7d0d
heziqi
speed of bip.base...
|
159
160
161
162
163
164
165
166
|
{
p1=(T*)malloc( L ); //memory allocation
p2=(T*)malloc( L );
memcpy(p1, c + (page - 1) * X, L);
memcpy(p2, c + page * X, L);
for(unsigned i=0; i < X; i++){
|
6708cc25
heziqi
Ziqi added envi c...
|
167
|
double r = (double) (wavelength - w[page-1]) / (double) (w[page] - w[page-1]);
|
c25e7d0d
heziqi
speed of bip.base...
|
168
169
170
171
172
173
174
175
176
|
p[i] = (p2[i] - p1[i]) * r + p1[i];
}
}
else //if the wavelength is equal to a wavelength in header file
memcpy(p, c + page * X, L);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
177
178
179
180
181
|
/// Retrieve a single spectrum (B-axis line) at a given (x, y) location and stores it in pre-allocated memory.
/// @param p is a pointer to pre-allocated memory at least B * sizeof(T) in size.
/// @param x is the x-coordinate (dimension 1) of the spectrum.
/// @param y is the y-coordinate (dimension 2) of the spectrum.
|
e933c14e
David Mayerich
cleaned up the code
|
182
|
bool spectrum(T * p, unsigned x, unsigned y){
|
c25e7d0d
heziqi
speed of bip.base...
|
183
|
|
6708cc25
heziqi
Ziqi added envi c...
|
184
|
if ( x >= R[0] || y >= R[1]){ //make sure the sample and line number is right
|
c25e7d0d
heziqi
speed of bip.base...
|
185
186
187
188
|
std::cout<<"ERROR: sample or line out of range"<<std::endl;
exit(1);
}
|
6708cc25
heziqi
Ziqi added envi c...
|
189
|
unsigned jump = (R[0] - 1) * sizeof(T);
|
c25e7d0d
heziqi
speed of bip.base...
|
190
|
|
6708cc25
heziqi
Ziqi added envi c...
|
191
|
file.seekg((y * R[0] * R[2] + x) * sizeof(T), std::ios::beg);
|
c25e7d0d
heziqi
speed of bip.base...
|
192
|
|
6708cc25
heziqi
Ziqi added envi c...
|
193
|
for(unsigned i = 0; i < R[2]; i++)
|
bfe9c6db
heziqi
added feature_mat...
|
194
195
|
{
//point to the certain sample and line
|
c25e7d0d
heziqi
speed of bip.base...
|
196
197
198
199
200
201
|
file.read((char *)(p + i), sizeof(T));
file.seekg(jump, std::ios::cur);
}
return true;
}
|
bfe9c6db
heziqi
added feature_mat...
|
202
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
203
204
205
206
|
/// Retrieve a single pixel and stores it in pre-allocated memory.
/// @param p is a pointer to pre-allocated memory at least sizeof(T) in size.
/// @param n is an integer index to the pixel using linear array indexing.
|
bfe9c6db
heziqi
added feature_mat...
|
207
208
209
210
211
212
213
214
215
|
bool pixel(T * p, unsigned n){
//calculate the corresponding x, y
unsigned int x = n % R[0];
unsigned int y = n / R[0];
//get the pixel
return spectrum(p, x, y);
}
|
c25e7d0d
heziqi
speed of bip.base...
|
216
217
218
219
|
//given a Y ,return a XZ slice
bool getY(T * p, unsigned y)
{
|
6708cc25
heziqi
Ziqi added envi c...
|
220
|
if ( y >= R[1]){ //make sure the line number is right
|
c25e7d0d
heziqi
speed of bip.base...
|
221
222
223
224
|
std::cout<<"ERROR: line out of range"<<std::endl;
exit(1);
}
|
6708cc25
heziqi
Ziqi added envi c...
|
225
226
|
file.seekg(y * R[2] * R[0] * sizeof(T), std::ios::beg);
file.read((char *)p, sizeof(T) * R[2] * R[0]);
|
c25e7d0d
heziqi
speed of bip.base...
|
227
228
229
230
231
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
232
233
234
235
|
/// Perform baseline correction given a list of baseline points and stores the result in a new BSQ file.
/// @param outname is the name of the output file used to store the resulting baseline-corrected data.
/// @param wls is the list of baseline points based on band labels.
|
c25e7d0d
heziqi
speed of bip.base...
|
236
237
238
239
240
241
242
243
|
bool baseline(std::string outname, std::vector<double> wls){
unsigned N = wls.size(); //get the number of baseline points
std::ofstream target(outname.c_str(), std::ios::binary); //open the target binary file
std::string headername = outname + ".hdr"; //the header file name
//simplify image resolution
|
6708cc25
heziqi
Ziqi added envi c...
|
244
|
unsigned int ZX = R[2] * R[0]; //calculate the number of points in a Y slice
|
c25e7d0d
heziqi
speed of bip.base...
|
245
|
unsigned int L = ZX * sizeof(T); //calculate the number of bytes of a Y slice
|
6708cc25
heziqi
Ziqi added envi c...
|
246
247
|
unsigned int B = R[2];
unsigned int X = R[0];
|
c25e7d0d
heziqi
speed of bip.base...
|
248
249
250
251
252
253
254
255
256
257
258
259
260
|
T* c; //pointer to the current Y slice
c = (T*)malloc(L); //memory allocation
T* a; //pointer to the two YZ lines surrounding the current YZ line
T* b;
a = (T*)malloc(X * sizeof(T));
b = (T*)malloc(X * sizeof(T));
double ai, bi; //stores the two baseline points wavelength surrounding the current band
double ci; //stores the current band's wavelength
|
f6169dea
heziqi
Ziqi completed bi...
|
261
|
unsigned control;
|
c25e7d0d
heziqi
speed of bip.base...
|
262
263
264
265
266
267
268
|
if (a == NULL || b == NULL || c == NULL){
std::cout<<"ERROR: error allocating memory";
exit(1);
}
// loop start correct every y slice
|
6708cc25
heziqi
Ziqi added envi c...
|
269
|
for (unsigned k =0; k < R[1]; k++)
|
c25e7d0d
heziqi
speed of bip.base...
|
270
271
272
273
274
|
{
//get the current y slice
getY(c, k);
//initialize lownum, highnum, low, high
|
6708cc25
heziqi
Ziqi added envi c...
|
275
|
ai = w[0];
|
f6169dea
heziqi
Ziqi completed bi...
|
276
|
control=0;
|
c25e7d0d
heziqi
speed of bip.base...
|
277
278
|
//if no baseline point is specified at band 0,
//set the baseline point at band 0 to 0
|
6708cc25
heziqi
Ziqi added envi c...
|
279
|
if(wls[0] != w[0]){
|
c25e7d0d
heziqi
speed of bip.base...
|
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
|
bi = wls[control];
memset(a, (char)0, X * sizeof(T) );
}
//else get the low band
else{
control++;
getYZ(a, c, ai);
bi = wls[control];
}
//get the high band
getYZ(b, c, bi);
//correct every YZ line
for(unsigned cii = 0; cii < B; cii++){
//update baseline points, if necessary
|
6708cc25
heziqi
Ziqi added envi c...
|
297
|
if( w[cii] >= bi && cii != B - 1) {
|
c25e7d0d
heziqi
speed of bip.base...
|
298
299
300
301
302
303
304
305
306
307
308
309
310
|
//if the high band is now on the last BL point
if (control != N-1) {
control++; //increment the index
std::swap(a, b); //swap the baseline band pointers
ai = bi;
bi = wls[control];
getYZ(b, c, bi);
}
//if the last BL point on the last band of the file?
|
6708cc25
heziqi
Ziqi added envi c...
|
311
|
else if ( wls[control] < w[B - 1]) {
|
c25e7d0d
heziqi
speed of bip.base...
|
312
313
314
315
316
317
|
std::swap(a, b); //swap the baseline band pointers
memset(b, (char)0, X * sizeof(T) ); //clear the high band
ai = bi;
|
6708cc25
heziqi
Ziqi added envi c...
|
318
|
bi = w[B - 1];
|
c25e7d0d
heziqi
speed of bip.base...
|
319
320
|
}
}
|
c25e7d0d
heziqi
speed of bip.base...
|
321
|
|
6708cc25
heziqi
Ziqi added envi c...
|
322
|
ci = w[cii];
|
c25e7d0d
heziqi
speed of bip.base...
|
323
324
325
326
327
328
|
unsigned jump = cii * X;
//perform the baseline correction
for(unsigned i=0; i < X; i++)
{
double r = (double) (ci - ai) / (double) (bi - ai);
|
92e4cf05
heziqi
include file fixed
|
329
|
c[i + jump] =(T) ( c[i + jump] - (b[i] - a[i]) * r - a[i] );
|
c25e7d0d
heziqi
speed of bip.base...
|
330
331
332
|
}
}//loop for YZ line end
|
c25e7d0d
heziqi
speed of bip.base...
|
333
|
target.write(reinterpret_cast<const char*>(c), L); //write the corrected data into destination
|
6708cc25
heziqi
Ziqi added envi c...
|
334
|
}//loop for Y slice end
|
c25e7d0d
heziqi
speed of bip.base...
|
335
336
337
338
339
340
341
342
343
|
free(a);
free(b);
free(c);
target.close();
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
344
345
346
347
348
|
/// Normalize all spectra based on the value of a single band, storing the result in a new BSQ file.
/// @param outname is the name of the output file used to store the resulting baseline-corrected data.
/// @param w is the label specifying the band that the hyperspectral image will be normalized to.
/// @param t is a threshold specified such that a spectrum with a value at w less than t is set to zero. Setting this threshold allows the user to limit division by extremely small numbers.
|
93503ec6
David Mayerich
allowed masking d...
|
349
|
bool normalize(std::string outname, double w, double t = 0.0)
|
c25e7d0d
heziqi
speed of bip.base...
|
350
|
{
|
6708cc25
heziqi
Ziqi added envi c...
|
351
352
353
354
355
|
unsigned int B = R[2]; //calculate the number of bands
unsigned int Y = R[1];
unsigned int X = R[0];
unsigned int ZX = R[2] * R[0];
unsigned int XY = R[0] * R[1]; //calculate the number of pixels in a band
|
c25e7d0d
heziqi
speed of bip.base...
|
356
357
358
359
360
361
362
363
364
365
366
367
|
unsigned int S = XY * sizeof(T); //calculate the number of bytes in a band
unsigned int L = ZX * sizeof(T);
std::ofstream target(outname.c_str(), std::ios::binary); //open the target binary file
std::string headername = outname + ".hdr"; //the header file name
T * c; //pointer to the current ZX slice
T * b; //pointer to the standard band
b = (T*)malloc( S ); //memory allocation
c = (T*)malloc( L );
|
e933c14e
David Mayerich
cleaned up the code
|
368
|
band(b, w); //get the certain band into memory
|
c25e7d0d
heziqi
speed of bip.base...
|
369
370
371
372
|
for(unsigned j = 0; j < Y; j++)
{
getY(c, j);
|
f6169dea
heziqi
Ziqi completed bi...
|
373
|
for(unsigned i = 0; i < B; i++)
|
c25e7d0d
heziqi
speed of bip.base...
|
374
|
{
|
f6169dea
heziqi
Ziqi completed bi...
|
375
|
for(unsigned m = 0; m < X; m++)
|
c25e7d0d
heziqi
speed of bip.base...
|
376
|
{
|
93503ec6
David Mayerich
allowed masking d...
|
377
378
379
380
|
if( b[m + j * X] < t )
c[m + i * X] = (T)0.0;
else
c[m + i * X] = c[m + i * X] / b[m + j * X];
|
c25e7d0d
heziqi
speed of bip.base...
|
381
382
383
384
|
}
}
target.write(reinterpret_cast<const char*>(c), L); //write normalized data into destination
}
|
c25e7d0d
heziqi
speed of bip.base...
|
385
386
387
388
389
390
391
|
free(b);
free(c);
target.close();
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
392
393
394
|
/// Convert the current BIL file to a BSQ file with the specified file name.
/// @param outname is the name of the output BSQ file to be saved to disk.
|
c25e7d0d
heziqi
speed of bip.base...
|
395
396
|
bool bsq(std::string outname)
{
|
6708cc25
heziqi
Ziqi added envi c...
|
397
|
unsigned int S = R[0] * R[1] * sizeof(T); //calculate the number of bytes in a band
|
c25e7d0d
heziqi
speed of bip.base...
|
398
399
400
401
402
403
404
|
std::ofstream target(outname.c_str(), std::ios::binary);
std::string headername = outname + ".hdr";
T * p; //pointer to the current band
p = (T*)malloc(S);
|
6708cc25
heziqi
Ziqi added envi c...
|
405
|
for ( unsigned i = 0; i < R[2]; i++)
|
c25e7d0d
heziqi
speed of bip.base...
|
406
407
408
409
|
{
band_index(p, i);
target.write(reinterpret_cast<const char*>(p), S); //write a band data into target file
}
|
6708cc25
heziqi
Ziqi added envi c...
|
410
|
|
c25e7d0d
heziqi
speed of bip.base...
|
411
412
413
414
415
|
free(p);
target.close();
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
416
417
418
|
/// Convert the current BIL file to a BIP file with the specified file name.
/// @param outname is the name of the output BIP file to be saved to disk.
|
f6169dea
heziqi
Ziqi completed bi...
|
419
420
|
bool bip(std::string outname)
{
|
6708cc25
heziqi
Ziqi added envi c...
|
421
|
unsigned int S = R[0] * R[2] * sizeof(T); //calculate the number of bytes in a ZX slice
|
f6169dea
heziqi
Ziqi completed bi...
|
422
423
424
425
426
427
428
429
430
|
std::ofstream target(outname.c_str(), std::ios::binary);
std::string headername = outname + ".hdr";
T * p; //pointer to the current XZ slice for bil file
p = (T*)malloc(S);
T * q; //pointer to the current ZX slice for bip file
q = (T*)malloc(S);
|
6708cc25
heziqi
Ziqi added envi c...
|
431
|
for ( unsigned i = 0; i < R[1]; i++)
|
f6169dea
heziqi
Ziqi completed bi...
|
432
433
|
{
getY(p, i);
|
6708cc25
heziqi
Ziqi added envi c...
|
434
|
for ( unsigned k = 0; k < R[2]; k++)
|
f6169dea
heziqi
Ziqi completed bi...
|
435
|
{
|
6708cc25
heziqi
Ziqi added envi c...
|
436
437
438
|
unsigned ks = k * R[0];
for ( unsigned j = 0; j < R[0]; j++)
q[k + j * R[2]] = p[ks + j];
|
f6169dea
heziqi
Ziqi completed bi...
|
439
440
441
442
443
|
}
target.write(reinterpret_cast<const char*>(q), S); //write a band data into target file
}
|
6708cc25
heziqi
Ziqi added envi c...
|
444
|
|
f6169dea
heziqi
Ziqi completed bi...
|
445
446
447
448
449
450
|
free(p);
free(q);
target.close();
return true;
}
|
20c212c0
heziqi
Ziqi added functi...
|
451
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
452
453
454
455
456
457
458
459
|
/// Return a baseline corrected band given two adjacent baseline points and their bands. The result is stored in a pre-allocated array.
/// @param lb is the label value for the left baseline point
/// @param rb is the label value for the right baseline point
/// @param lp is a pointer to an array holding the band image for the left baseline point
/// @param rp is a pointer to an array holding the band image for the right baseline point
/// @param wavelength is the label value for the requested baseline-corrected band
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size.
|
20c212c0
heziqi
Ziqi added functi...
|
460
461
462
463
464
465
466
467
468
469
470
471
|
bool baseline_band(double lb, double rb, T* lp, T* rp, double wavelength, T* result){
unsigned XY = R[0] * R[1];
band(result, wavelength); //get band
//perform the baseline correction
double r = (double) (wavelength - lb) / (double) (rb - lb);
for(unsigned i=0; i < XY; i++){
result[i] =(T) (result[i] - (rp[i] - lp[i]) * r - lp[i] );
}
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
472
473
474
475
476
477
478
|
/// Return a baseline corrected band given two adjacent baseline points. The result is stored in a pre-allocated array.
/// @param lb is the label value for the left baseline point
/// @param rb is the label value for the right baseline point
/// @param bandwavelength is the label value for the desired baseline-corrected band
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size.
|
70407ea9
heziqi
Ziqi completed he...
|
479
|
bool height(double lb, double rb, double bandwavelength, T* result){
|
20c212c0
heziqi
Ziqi added functi...
|
480
481
482
|
T* lp;
T* rp;
|
70407ea9
heziqi
Ziqi completed he...
|
483
484
485
486
|
unsigned XY = R[0] * R[1];
unsigned S = XY * sizeof(T);
lp = (T*) malloc(S); //memory allocation
rp = (T*) malloc(S);
|
20c212c0
heziqi
Ziqi added functi...
|
487
|
|
70407ea9
heziqi
Ziqi completed he...
|
488
|
band(lp, lb);
|
20c212c0
heziqi
Ziqi added functi...
|
489
490
491
492
|
band(rp, rb);
baseline_band(lb, rb, lp, rp, bandwavelength, result);
|
517876d6
heziqi
metrics finished ...
|
493
494
|
free(lp);
free(rp);
|
20c212c0
heziqi
Ziqi added functi...
|
495
496
497
|
return true;
}
|
70407ea9
heziqi
Ziqi completed he...
|
498
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
499
500
501
502
503
504
505
506
|
/// Calculate the area under the spectrum between two specified points and stores the result in a pre-allocated array.
/// @param lb is the label value for the left baseline point
/// @param rb is the label value for the right baseline point
/// @param lab is the label value for the left bound (start of the integration)
/// @param rab is the label value for the right bound (end of the integration)
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
70407ea9
heziqi
Ziqi completed he...
|
507
|
bool area(double lb, double rb, double lab, double rab, T* result){
|
20c212c0
heziqi
Ziqi added functi...
|
508
509
510
511
512
|
T* lp; //left band pointer
T* rp; //right band pointer
T* cur; //current band 1
T* cur2; //current band 2
|
20c212c0
heziqi
Ziqi added functi...
|
513
514
515
516
517
518
519
520
|
unsigned XY = R[0] * R[1];
unsigned S = XY * sizeof(T);
lp = (T*) malloc(S); //memory allocation
rp = (T*) malloc(S);
cur = (T*) malloc(S);
cur2 = (T*) malloc(S);
|
20c212c0
heziqi
Ziqi added functi...
|
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
|
memset(result, (char)0, S);
//find the wavelenght position in the whole band
unsigned int n = w.size();
unsigned int ai = 0; //left bound position
unsigned int bi = n - 1; //right bound position
//to make sure the left and the right bound are in the bandwidth
if (lb < w[0] || rb < w[0] || lb > w[n-1] || rb >w[n-1]){
std::cout<<"ERROR: left bound or right bound out of bandwidth"<<std::endl;
exit(1);
}
//to make sure rigth bound is bigger than left bound
else if(lb > rb){
std::cout<<"ERROR: right bound should be bigger than left bound"<<std::endl;
exit(1);
}
//get the position of lb and rb
|
70407ea9
heziqi
Ziqi completed he...
|
543
|
while (lab >= w[ai]){
|
20c212c0
heziqi
Ziqi added functi...
|
544
545
|
ai++;
}
|
70407ea9
heziqi
Ziqi completed he...
|
546
|
while (rab <= w[bi]){
|
20c212c0
heziqi
Ziqi added functi...
|
547
548
549
550
551
552
553
|
bi--;
}
band(lp, lb);
band(rp, rb);
//calculate the beginning and the ending part
|
70407ea9
heziqi
Ziqi completed he...
|
554
555
|
baseline_band(lb, rb, lp, rp, rab, cur2); //ending part
baseline_band(lb, rb, lp, rp, w[bi], cur);
|
20c212c0
heziqi
Ziqi added functi...
|
556
|
for(unsigned j = 0; j < XY; j++){
|
70407ea9
heziqi
Ziqi completed he...
|
557
|
result[j] += (rab - w[bi]) * (cur[j] + cur2[j]) / 2.0;
|
20c212c0
heziqi
Ziqi added functi...
|
558
|
}
|
70407ea9
heziqi
Ziqi completed he...
|
559
560
|
baseline_band(lb, rb, lp, rp, lab, cur2); //beginnning part
baseline_band(lb, rb, lp, rp, w[ai], cur);
|
20c212c0
heziqi
Ziqi added functi...
|
561
|
for(unsigned j = 0; j < XY; j++){
|
70407ea9
heziqi
Ziqi completed he...
|
562
|
result[j] += (w[ai] - lab) * (cur[j] + cur2[j]) / 2.0;
|
20c212c0
heziqi
Ziqi added functi...
|
563
|
}
|
517876d6
heziqi
metrics finished ...
|
564
|
|
20c212c0
heziqi
Ziqi added functi...
|
565
566
567
568
569
570
571
572
573
574
575
|
//calculate the area
ai++;
for(unsigned i = ai; i <= bi ;i++)
{
baseline_band(lb, rb, lp, rp, w[ai], cur2);
for(unsigned j = 0; j < XY; j++)
{
result[j] += (w[ai] - w[ai-1]) * (cur[j] + cur2[j]) / 2.0;
}
std::swap(cur,cur2); //swap the band pointers
}
|
70407ea9
heziqi
Ziqi completed he...
|
576
|
|
517876d6
heziqi
metrics finished ...
|
577
578
579
580
|
free(lp);
free(rp);
free(cur);
free(cur2);
|
20c212c0
heziqi
Ziqi added functi...
|
581
582
583
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
584
585
586
587
588
589
590
591
592
|
/// Compute the ratio of two baseline-corrected peaks. The result is stored in a pre-allocated array.
/// @param lb1 is the label value for the left baseline point for the first peak (numerator)
/// @param rb1 is the label value for the right baseline point for the first peak (numerator)
/// @param pos1 is the label value for the first peak (numerator) position
/// @param lb2 is the label value for the left baseline point for the second peak (denominator)
/// @param rb2 is the label value for the right baseline point for the second peak (denominator)
/// @param pos2 is the label value for the second peak (denominator) position
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
70407ea9
heziqi
Ziqi completed he...
|
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
|
bool ph_to_ph(double lb1, double rb1, double pos1, double lb2, double rb2, double pos2, T * result){
T* p1 = (T*)malloc(R[0] * R[1] * sizeof(T));
T* p2 = (T*)malloc(R[0] * R[1] * sizeof(T));
//get the two peak band
height(lb1, rb1, pos1, p1);
height(lb2, rb2, pos2, p2);
//calculate the ratio in result
for(unsigned i = 0; i < R[0] * R[1]; i++){
if(p1[i] == 0 && p2[i] ==0)
result[i] = 1;
else
result[i] = p1[i] / p2[i];
}
|
517876d6
heziqi
metrics finished ...
|
608
609
610
|
free(p1);
free(p2);
|
70407ea9
heziqi
Ziqi completed he...
|
611
612
613
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
614
615
616
617
618
619
620
621
622
|
/// Compute the ratio between a peak area and peak height.
/// @param lb1 is the label value for the left baseline point for the first peak (numerator)
/// @param rb1 is the label value for the right baseline point for the first peak (numerator)
/// @param pos1 is the label value for the first peak (numerator) position
/// @param lb2 is the label value for the left baseline point for the second peak (denominator)
/// @param rb2 is the label value for the right baseline point for the second peak (denominator)
/// @param pos2 is the label value for the second peak (denominator) position
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
70407ea9
heziqi
Ziqi completed he...
|
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
|
bool pa_to_ph(double lb1, double rb1, double lab1, double rab1,
double lb2, double rb2, double pos, T* result){
T* p1 = (T*)malloc(R[0] * R[1] * sizeof(T));
T* p2 = (T*)malloc(R[0] * R[1] * sizeof(T));
//get the area and the peak band
area(lb1, rb1, lab1, rab1, p1);
height(lb2, rb2, pos, p2);
//calculate the ratio in result
for(unsigned i = 0; i < R[0] * R[1]; i++){
if(p1[i] == 0 && p2[i] ==0)
result[i] = 1;
else
result[i] = p1[i] / p2[i];
}
|
517876d6
heziqi
metrics finished ...
|
639
640
641
|
free(p1);
free(p2);
|
70407ea9
heziqi
Ziqi completed he...
|
642
643
644
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
645
646
647
648
649
650
651
652
653
654
655
|
/// Compute the ratio between two peak areas.
/// @param lb1 is the label value for the left baseline point for the first peak (numerator)
/// @param rb1 is the label value for the right baseline point for the first peak (numerator)
/// @param lab1 is the label value for the left bound (start of the integration) of the first peak (numerator)
/// @param rab1 is the label value for the right bound (end of the integration) of the first peak (numerator)
/// @param lb2 is the label value for the left baseline point for the second peak (denominator)
/// @param rb2 is the label value for the right baseline point for the second peak (denominator)
/// @param lab2 is the label value for the left bound (start of the integration) of the second peak (denominator)
/// @param rab2 is the label value for the right bound (end of the integration) of the second peak (denominator)
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
70407ea9
heziqi
Ziqi completed he...
|
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
|
bool pa_to_pa(double lb1, double rb1, double lab1, double rab1,
double lb2, double rb2, double lab2, double rab2, T* result){
T* p1 = (T*)malloc(R[0] * R[1] * sizeof(T));
T* p2 = (T*)malloc(R[0] * R[1] * sizeof(T));
//get the area and the peak band
area(lb1, rb1, lab1, rab1, p1);
area(lb2, rb2, lab2, rab2, p2);
//calculate the ratio in result
for(unsigned i = 0; i < R[0] * R[1]; i++){
if(p1[i] == 0 && p2[i] ==0)
result[i] = 1;
else
result[i] = p1[i] / p2[i];
}
|
517876d6
heziqi
metrics finished ...
|
672
673
674
|
free(p1);
free(p2);
|
70407ea9
heziqi
Ziqi completed he...
|
675
676
677
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
678
679
680
681
682
683
684
|
/// Compute the definite integral of a baseline corrected peak.
/// @param lb is the label value for the left baseline point
/// @param rb is the label value for the right baseline point
/// @param lab is the label for the start of the definite integral
/// @param rab is the label for the end of the definite integral
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
517876d6
heziqi
metrics finished ...
|
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
|
bool x_area(double lb, double rb, double lab, double rab, T* result){
T* lp; //left band pointer
T* rp; //right band pointer
T* cur; //current band 1
T* cur2; //current band 2
unsigned XY = R[0] * R[1];
unsigned S = XY * sizeof(T);
lp = (T*) malloc(S); //memory allocation
rp = (T*) malloc(S);
cur = (T*) malloc(S);
cur2 = (T*) malloc(S);
memset(result, (char)0, S);
//find the wavelenght position in the whole band
unsigned int n = w.size();
unsigned int ai = 0; //left bound position
unsigned int bi = n - 1; //right bound position
//to make sure the left and the right bound are in the bandwidth
if (lb < w[0] || rb < w[0] || lb > w[n-1] || rb >w[n-1]){
std::cout<<"ERROR: left bound or right bound out of bandwidth"<<std::endl;
exit(1);
}
//to make sure rigth bound is bigger than left bound
else if(lb > rb){
std::cout<<"ERROR: right bound should be bigger than left bound"<<std::endl;
exit(1);
}
//get the position of lb and rb
while (lab >= w[ai]){
ai++;
}
while (rab <= w[bi]){
bi--;
}
band(lp, lb);
band(rp, rb);
//calculate the beginning and the ending part
baseline_band(lb, rb, lp, rp, rab, cur2); //ending part
baseline_band(lb, rb, lp, rp, w[bi], cur);
for(unsigned j = 0; j < XY; j++){
result[j] += (rab - w[bi]) * (rab + w[bi]) * (cur[j] + cur2[j]) / 4.0;
}
baseline_band(lb, rb, lp, rp, lab, cur2); //beginnning part
baseline_band(lb, rb, lp, rp, w[ai], cur);
for(unsigned j = 0; j < XY; j++){
result[j] += (w[ai] - lab) * (w[ai] + lab) * (cur[j] + cur2[j]) / 4.0;
}
//calculate f(x) times x
ai++;
for(unsigned i = ai; i <= bi ;i++)
{
baseline_band(lb, rb, lp, rp, w[ai], cur2);
for(unsigned j = 0; j < XY; j++)
{
result[j] += (w[ai] - w[ai-1]) * (w[ai] + w[ai-1]) * (cur[j] + cur2[j]) / 4.0;
}
std::swap(cur,cur2); //swap the band pointers
}
free(lp);
free(rp);
free(cur);
free(cur2);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
759
760
761
762
763
764
765
|
/// Compute the centroid of a baseline corrected peak.
/// @param lb is the label value for the left baseline point
/// @param rb is the label value for the right baseline point
/// @param lab is the label for the start of the peak
/// @param rab is the label for the end of the peak
/// @param result is a pointer to a pre-allocated array at least X * Y * sizeof(T) in size
|
517876d6
heziqi
metrics finished ...
|
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
|
bool cpoint(double lb, double rb, double lab, double rab, T* result){
T* p1 = (T*)malloc(R[0] * R[1] * sizeof(T));
T* p2 = (T*)malloc(R[0] * R[1] * sizeof(T));
//get the area and the peak band
x_area(lb, rb, lab, rab, p1);
area(lb, rb, lab, rab, p2);
//calculate the ratio in result
for(unsigned i = 0; i < R[0] * R[1]; i++){
if(p1[i] == 0 && p2[i] ==0)
result[i] = 1;
else
result[i] = p1[i] / p2[i];
}
free(p1);
free(p2);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
786
787
788
789
790
791
792
|
/// Create a mask based on a given band and threshold value.
/// All pixels in the
/// specified band greater than the threshold are true and all pixels less than the threshold are false.
/// @param mask_band is the band used to specify the mask
/// @param threshold is the threshold used to determine if the mask value is true or false
/// @param p is a pointer to a pre-allocated array at least X * Y in size
|
f4c5d71b
David Mayerich
started working w...
|
793
|
bool build_mask(double mask_band, double threshold, unsigned char* p){
|
4a6f666c
heziqi
Added mask method
|
794
795
796
797
798
799
800
801
802
803
804
|
T* temp = (T*)malloc(R[0] * R[1] * sizeof(T)); //allocate memory for the certain band
band(temp, mask_band);
for (unsigned int i = 0; i < R[0] * R[1]; i++) {
if (temp[i] < threshold)
p[i] = 0;
else
p[i] = 255;
}
|
517876d6
heziqi
metrics finished ...
|
805
|
free(temp);
|
4a6f666c
heziqi
Added mask method
|
806
807
808
|
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
809
810
811
812
|
/// Apply a mask file to the BSQ image, setting all values outside the mask to zero.
/// @param outfile is the name of the masked output file
/// @param p is a pointer to memory of size X * Y, where p(i) = 0 for pixels that will be set to zero.
|
740f8cd2
heziqi
added apply_mask
|
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
|
bool apply_mask(std::string outfile, unsigned char* p){
std::ofstream target(outfile.c_str(), std::ios::binary);
unsigned XZ = R[0] * R[2]; //calculate number of a band
unsigned L = XZ * sizeof(T);
T * temp = (T*)malloc(L);
for (unsigned i = 0; i < R[1]; i++)
{
getY(temp, i);
for ( unsigned j = 0; j < R[2]; j++)
{
for (unsigned k = 0; k < R[0]; k++)
{
if(p[i * R[0] + k] == 0)
temp[j * R[0] + k] = 0;
else
continue;
}
}
target.write(reinterpret_cast<const char*>(temp), L); //write a band data into target file
}
target.close();
free(temp);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
842
843
844
|
/// Calculate the mean band value (average along B) at each pixel location.
/// @param p is a pointer to memory of size X * Y * sizeof(T) that will store the band averages.
|
a43c4fe1
heziqi
Added crop in env...
|
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
|
bool band_avg(T* p){
unsigned long long XZ = R[0] * R[2];
T* temp = (T*)malloc(sizeof(T) * XZ);
T* line = (T*)malloc(sizeof(T) * R[0]);
for (unsigned i = 0; i < R[1]; i++){
getY(temp, i);
//initialize x-line
for (unsigned j = 0; j < R[0]; j++){
line[j] = 0;
}
unsigned c = 0;
for (unsigned j = 0; j < R[2]; j++){
for (unsigned k = 0; k < R[0]; k++){
line[k] += temp[c] / (T)R[2];
c++;
}
}
for (unsigned j = 0; j < R[0]; j++){
p[j + i * R[0]] = line[j];
}
}
free(temp);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
871
872
873
874
|
/// Calculate the mean value for all masked (or valid) pixels in a band and returns the average spectrum
/// @param p is a pointer to pre-allocated memory of size [B * sizeof(T)] that stores the mean spectrum
/// @param mask is a pointer to memory of size [X * Y] that stores the mask value at each pixel location
|
a43c4fe1
heziqi
Added crop in env...
|
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
|
bool avg_band(T*p, unsigned char* mask){
unsigned long long XZ = R[0] * R[2];
unsigned long long XY = R[0] * R[1];
T* temp = (T*)malloc(sizeof(T) * XZ);
for (unsigned j = 0; j < R[2]; j++){
p[j] = 0;
}
//calculate vaild number in a band
unsigned count = 0;
for (unsigned j = 0; j < XY; j++){
if (mask[j] != 0){
count++;
}
}
for (unsigned k = 0; k < R[1]; k++){
getY(temp, k);
unsigned kx = k * R[0];
for (unsigned i = 0; i < R[0]; i++){
if (mask[kx + i] != 0){
for (unsigned j = 0; j < R[2]; j++){
p[j] += temp[j * R[0] + i] / (T)count;
}
}
}
}
free(temp);
return true;
}
|
a23c4132
David Mayerich
Doxygen comments ...
|
904
905
906
907
908
|
/// Calculate the covariance matrix for all masked pixels in the image.
/// @param co is a pointer to pre-allocated memory of size [B * B] that stores the resulting covariance matrix
/// @param avg is a pointer to memory of size B that stores the average spectrum
/// @param mask is a pointer to memory of size [X * Y] that stores the mask value at each pixel location
|
a43c4fe1
heziqi
Added crop in env...
|
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
|
bool co_matrix(T* co, T* avg, unsigned char *mask){
//memory allocation
unsigned long long xy = R[0] * R[1];
unsigned int B = R[2];
T* temp = (T*)malloc(sizeof(T) * B);
//count vaild pixels in a band
unsigned count = 0;
for (unsigned j = 0; j < xy; j++){
if (mask[j] != 0){
count++;
}
}
//initialize correlation matrix
for (unsigned i = 0; i < B; i++){
for (unsigned k = 0; k < B; k++){
co[i * B + k] = 0;
}
}
//calculate correlation coefficient matrix
for (unsigned j = 0; j < xy; j++){
if (mask[j] != 0){
pixel(temp, j);
for (unsigned i = 0; i < B; i++){
for (unsigned k = i; k < B; k++){
co[i * B + k] += (temp[i] - avg[i]) * (temp[k] - avg[k]) / count;
}
}
}
}
//because correlation matrix is symmetric
for (unsigned i = 0; i < B; i++){
for (unsigned k = i + 1; k < B; k++){
co[k * B + i] = co[i * B + k];
}
}
free(temp);
return true;
}
|
0df38ff3
heziqi
fixed head detached
|
949
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
950
951
952
953
954
955
956
|
/// Crop a region of the image and save it to a new file.
/// @param outfile is the file name for the new cropped image
/// @param x0 is the lower-left x pixel coordinate to be included in the cropped image
/// @param y0 is the lower-left y pixel coordinate to be included in the cropped image
/// @param x1 is the upper-right x pixel coordinate to be included in the cropped image
/// @param y1 is the upper-right y pixel coordinate to be included in the cropped image
|
a43c4fe1
heziqi
Added crop in env...
|
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
|
bool crop(std::string outfile, unsigned x0, unsigned y0, unsigned x1, unsigned y1){
//calculate the new number of samples and lines
unsigned long long sam = x1 - x0; //samples
unsigned long long lin = y1 - y0; //lines
unsigned long long L = sam * R[2] * sizeof(T);
//get specified band and save
T* temp = (T*)malloc(L);
std::ofstream out(outfile.c_str(), std::ios::binary);
unsigned long long jumpb = (R[0] - sam) * sizeof(T); //jump pointer to the next band
//get start
file.seekg((y0 * R[0] * R[2] + x0) * sizeof(T), std::ios::beg);
for (unsigned i = 0; i < lin; i++)
{
for (unsigned j = 0; j < R[2]; j++)
{
file.read((char *)(temp + j * sam), sizeof(T) * sam);
file.seekg(jumpb, std::ios::cur); //go to the next band
}
out.write(reinterpret_cast<const char*>(temp), L); //write slice data into target file
}
free(temp);
return true;
}
|
0df38ff3
heziqi
fixed head detached
|
982
|
|
a23c4132
David Mayerich
Doxygen comments ...
|
983
|
/// Close the file.
|
f6169dea
heziqi
Ziqi completed bi...
|
984
985
986
987
988
|
bool close(){
file.close();
return true;
}
|
c25e7d0d
heziqi
speed of bip.base...
|
989
|
};
|
cac62fd3
David Mayerich
modified to work ...
|
990
|
}
|
6aa04ba2
David Mayerich
interleave types
|
991
992
|
#endif
|