geo_normalize.c: avoid look up of user-defined geokeys that cause PRO…

…J warnings (fixes OSGeo/gdal#2321)
OSGeo · Mar 27, 2020 · e06625c · e06625c
1 parent 8feb012
commit e06625c
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/libgeotiff/geo_normalize.c b/libgeotiff/geo_normalize.c
@@ -157,6 +157,9 @@ int GTIFGetPCSInfoEx( void* ctxIn,
         }
     }
 
+    if( nPCSCode == KvUserDefined )
+        return FALSE;
+
     {
         char szCode[12];
         PJ* proj_crs;
@@ -446,6 +449,10 @@ int GTIFGetGCSInfoEx( void* ctxIn,
         return TRUE;
     }
 
+
+    if( nGCSCode == KvUserDefined )
+        return FALSE;
+
 /* -------------------------------------------------------------------- */
 /*      Search the database.                                            */
 /* -------------------------------------------------------------------- */
@@ -634,6 +641,9 @@ int GTIFGetEllipsoidInfoEx( void* ctxIn,
         return TRUE;
     }
 
+    if( nEllipseCode == KvUserDefined )
+        return FALSE;
+
 /* -------------------------------------------------------------------- */
 /*      Search the database.                                            */
 /* -------------------------------------------------------------------- */
@@ -706,6 +716,10 @@ int GTIFGetPMInfoEx( void* ctxIn,
         return TRUE;
     }
 
+
+    if( nPMCode == KvUserDefined )
+        return FALSE;
+
 /* -------------------------------------------------------------------- */
 /*      Search the database.                                            */
 /* -------------------------------------------------------------------- */
@@ -805,6 +819,9 @@ int GTIFGetDatumInfoEx( void* ctxIn,
         return TRUE;
     }
 
+    if( nDatumCode == KvUserDefined )
+        return FALSE;
+
 /* -------------------------------------------------------------------- */
 /*      Search the database.                                            */
 /* -------------------------------------------------------------------- */
@@ -920,6 +937,9 @@ int GTIFGetUOMLengthInfoEx( void* ctxIn,
         return TRUE;
     }
 
+    if( nUOMLengthCode == KvUserDefined )
+        return FALSE;
+
 /* -------------------------------------------------------------------- */
 /*      Search the units database for this unit.  If we don't find      */
 /*      it return failure.                                              */
@@ -1428,6 +1448,9 @@ int GTIFGetProjTRFInfoEx( void* ctxIn,
         return TRUE;
     }
 
+    if( nProjTRFCode == KvUserDefined )
+        return FALSE;
+
     {
         int     nProjMethod, i, anEPSGCodes[7];
         double  adfProjParms[7];