codebase / stimlib

Commit f6aa45e75e52d203e3f03baeac61bd4b7a8744a9

Authored by David Mayerich
1 parent 95502964

fixed Windows EOL problem in envi_header.h

Showing 2 changed files with 26 additions and 26 deletions   Show diff stats
Inline Side-by-side
1 -Copyright (c) 2009, David Mayerich  
2 -All rights reserved.  
3 -  
4 -Redistribution and use in source and binary forms, with or without  
5 -modification, are permitted provided that the following conditions are met:  
6 -  
7 -1. Redistributions of source code must retain the above copyright notice, this  
8 - list of conditions and the following disclaimer.  
9 -2. Redistributions in binary form must reproduce the above copyright notice,  
10 - this list of conditions and the following disclaimer in the documentation  
11 - and/or other materials provided with the distribution.  
12 -  
13 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND  
14 -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED  
15 -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE  
16 -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR  
17 -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES  
18 -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  
19 -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND  
20 -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
21 -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS  
22 -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
23 -  
24 -The views and conclusions contained in the software and documentation are those  
25 -of the authors and should not be interpreted as representing official policies, 1 +Copyright (c) 2009, David Mayerich
  2 +All rights reserved.
  3 +
  4 +Redistribution and use in source and binary forms, with or without
  5 +modification, are permitted provided that the following conditions are met:
  6 +
  7 +1. Redistributions of source code must retain the above copyright notice, this
  8 + list of conditions and the following disclaimer.
  9 +2. Redistributions in binary form must reproduce the above copyright notice,
  10 + this list of conditions and the following disclaimer in the documentation
  11 + and/or other materials provided with the distribution.
  12 +
  13 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  14 +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  15 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  16 +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  17 +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  18 +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  19 +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  20 +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  21 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  22 +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  23 +
  24 +The views and conclusions contained in the software and documentation are those
  25 +of the authors and should not be interpreted as representing official policies,
26 either expressed or implied, of the FreeBSD Project. 26 either expressed or implied, of the FreeBSD Project.
27 \ No newline at end of file 27 \ No newline at end of file
envi/envi_header.h
  Show/Hide comments   View file @f6aa45e
@@ -86,7 +86,7 @@ struct envi_header @@ -86,7 +86,7 @@ struct envi_header
86 } 86 }
87 87
88 for(end_i = line.length()-1; end_i >= start_i; end_i--) 88 for(end_i = line.length()-1; end_i >= start_i; end_i--)
89 - if(line[end_i] != ' ') 89 + if(line[end_i] != ' ' && line[end_i] != '\r')
90 { 90 {
91 break; 91 break;
92 } 92 }