|
1 | 1 | /******************************************************************************
|
2 |
| - * $Id$ |
3 | 2 | *
|
4 | 3 | * Project: libgeotiff
|
5 | 4 | * Purpose: Code to convert a normalized GeoTIFF definition into a PROJ.4
|
|
9 | 8 | ******************************************************************************
|
10 | 9 | * Copyright (c) 1999, Frank Warmerdam
|
11 | 10 | *
|
12 |
| - * Permission is hereby granted, free of charge, to any person obtaining a |
13 |
| - * copy of this software and associated documentation files (the "Software"), |
14 |
| - * to deal in the Software without restriction, including without limitation |
15 |
| - * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
16 |
| - * and/or sell copies of the Software, and to permit persons to whom the |
17 |
| - * Software is furnished to do so, subject to the following conditions: |
18 |
| - * |
19 |
| - * The above copyright notice and this permission notice shall be included |
20 |
| - * in all copies or substantial portions of the Software. |
21 |
| - * |
22 |
| - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
23 |
| - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
24 |
| - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
25 |
| - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
26 |
| - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
27 |
| - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
28 |
| - * DEALINGS IN THE SOFTWARE. |
| 11 | + * SPDX-License-Identifier: MIT |
29 | 12 | ******************************************************************************
|
30 | 13 | */
|
31 | 14 |
|
@@ -238,7 +221,7 @@ int GTIFSetFromProj4( GTIF *gtif, const char *proj4 )
|
238 | 221 | dfSemiMajor = OSR_GDV(papszNV,"a",0.0);
|
239 | 222 | dfSemiMinor = OSR_GDV(papszNV,"b",0.0);
|
240 | 223 | dfInvFlattening = OSR_GDV(papszNV,"rf",0.0);
|
241 |
| - if( dfSemiMinor != 0.0 && dfInvFlattening == 0.0 ) |
| 224 | + if( dfSemiMajor != 0.0 && dfSemiMinor != 0.0 && dfInvFlattening == 0.0 ) |
242 | 225 | dfInvFlattening = -1.0 / (dfSemiMinor/dfSemiMajor - 1.0);
|
243 | 226 | }
|
244 | 227 |
|
|
0 commit comments