Commit f136550635145c6e921d8ca5eb36a5083dc09c17
1 parent
28b882ce
modifications to remove warnings
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
stim/envi/binary.h
@@ -542,7 +542,7 @@ public: | @@ -542,7 +542,7 @@ public: | ||
542 | size_t size_bytes = sx * sy * sz * sizeof(T); //size of the block to read in bytes | 542 | size_t size_bytes = sx * sy * sz * sizeof(T); //size of the block to read in bytes |
543 | 543 | ||
544 | size_t start = z * R[0] * R[1] + y * R[0] + x; //calculate the start postion | 544 | size_t start = z * R[0] * R[1] + y * R[0] + x; //calculate the start postion |
545 | - size_t start_bytes = start * sizeof(T); //start position in bytes | 545 | + //size_t start_bytes = start * sizeof(T); //start position in bytes |
546 | file.seekg(start * sizeof(T), std::ios::beg); //seek to the start position | 546 | file.seekg(start * sizeof(T), std::ios::beg); //seek to the start position |
547 | 547 | ||
548 | 548 |
stim/envi/envi.h
@@ -110,6 +110,7 @@ public: | @@ -110,6 +110,7 @@ public: | ||
110 | std::cout << "ERROR: unidentified file type" << std::endl; | 110 | std::cout << "ERROR: unidentified file type" << std::endl; |
111 | exit(1); | 111 | exit(1); |
112 | } | 112 | } |
113 | + return false; | ||
113 | } | 114 | } |
114 | 115 | ||
115 | //test to determine if the specified file is an ENVI file | 116 | //test to determine if the specified file is an ENVI file |
@@ -1993,7 +1994,7 @@ public: | @@ -1993,7 +1994,7 @@ public: | ||
1993 | 1994 | ||
1994 | void fft(std::string outfile, double band_min, double band_max, size_t samples = 0, void* ratio = NULL, size_t rx = 0, size_t ry = 0, bool PROGRESS = false, int cuda_device = 0){ | 1995 | void fft(std::string outfile, double band_min, double band_max, size_t samples = 0, void* ratio = NULL, size_t rx = 0, size_t ry = 0, bool PROGRESS = false, int cuda_device = 0){ |
1995 | if(samples == 0) samples = header.bands; | 1996 | if(samples == 0) samples = header.bands; |
1996 | - double B = (double)header.bands; | 1997 | + //double B = (double)header.bands; |
1997 | double delta = header.wavelength[1] - header.wavelength[0]; //calculate spacing in the current domain | 1998 | double delta = header.wavelength[1] - header.wavelength[0]; //calculate spacing in the current domain |
1998 | double span = samples * delta; //calculate the span in the current domain | 1999 | double span = samples * delta; //calculate the span in the current domain |
1999 | double fft_delta = 1.0 / span; //calculate the span in the FFT domain | 2000 | double fft_delta = 1.0 / span; //calculate the span in the FFT domain |