codebase / stimlib

Commit d0ef98e39aa40ca8e340bbf003470de365b4b0f6

Authored by David Mayerich
1 parent c4dd399a

fixed a Linux compiler bug

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
@@ -1200,7 +1200,7 @@ public: @@ -1200,7 +1200,7 @@ public:
1200 /// @param x is the x-coordinate of the spectrum 1200 /// @param x is the x-coordinate of the spectrum
1201 /// @param y is the y-coordinate of the spectrum 1201 /// @param y is the y-coordinate of the spectrum
1202 template<typename T> 1202 template<typename T>
1203 - void spectrum(T* ptr, unsigned long long x, unsigned long long y, bool PROGRESS = false){ 1203 + void spectrum(T* ptr, size_t x, size_t y, bool PROGRESS = false){
1204 1204
1205 spectrum<T>(ptr, y * header.samples + x, PROGRESS); 1205 spectrum<T>(ptr, y * header.samples + x, PROGRESS);
1206 /*void* temp = alloc_array<T>(header.bands); //allocate space for the output array 1206 /*void* temp = alloc_array<T>(header.bands); //allocate space for the output array
stim/envi/envi_header.h
  Show/Hide comments   View file @d0ef98e
@@ -24,10 +24,10 @@ struct envi_header @@ -24,10 +24,10 @@ struct envi_header
24 24
25 std::string description; 25 std::string description;
26 26
27 - unsigned long long samples; //x-axis  
28 - unsigned long long lines; //y-axis  
29 - unsigned long long bands; //spectral axis  
30 - unsigned long long header_offset; //header offset for binary file (in bytes) 27 + size_t samples; //x-axis
  28 + size_t lines; //y-axis
  29 + size_t bands; //spectral axis
  30 + size_t header_offset; //header offset for binary file (in bytes)
31 std::string file_type; //should be "ENVI Standard" 31 std::string file_type; //should be "ENVI Standard"
32 32
33 envi_header::dataType data_type; //data representation; common value is 4 (32-bit float) 33 envi_header::dataType data_type; //data representation; common value is 4 (32-bit float)