Ticket #2134: gdal-1.5.0-bug-ogr_srs_proj4.patch

ogr/ogr_srs_proj4.cpp

@@ -697 +697 @@
-    const char *pszValue;
-    int  bFullyDefined = FALSE;
-
-    /* re-initialization of prime meridian and Greenwich shift */
-    /* to prevent counting them twice                          */
-    pszPM = NULL;
-    dfFromGreenwich = 0.0;
-
-    pszValue = CSLFetchNameValue(papszNV, "datum");
-    if( pszValue == NULL )
-    {
@@ -913 +908 @@
-/*      do we want to insert a PROJ.4 EXTENSION item?                   */
-/* -------------------------------------------------------------------- */
-    if( strstr(pszProj4,"wktext") != NULL )
-    {
-        CPLDebug( "OGR_PROJ4", "WKT extension asked :\n%s",
-                  pszProj4 );
-        SetExtension( GetRoot()->GetValue(), "PROJ4", pszProj4 );
-    }
-
-    CSLDestroy( papszNV );
-