diff --git a/gdal/apps/gdalinfo.c b/gdal/apps/gdalinfo.c index a7558bf..b75d8b0 100644 --- a/gdal/apps/gdalinfo.c +++ b/gdal/apps/gdalinfo.c @@ -278,7 +278,7 @@ int main( int argc, char ** argv ) char *pszProj4 = NULL; OSRExportToProj4( hSRS, &pszProj4 ); printf("PROJ.4 string is:\n\'%s\'\n",pszProj4); - CPLFree( pszProj4 ); + CPLFree( pszProj4 ); } OSRDestroySpatialReference( hSRS ); diff --git a/gdal/frmts/gtiff/gt_wkt_srs.cpp b/gdal/frmts/gtiff/gt_wkt_srs.cpp index 38ab449..2ff4ba4 100644 --- a/gdal/frmts/gtiff/gt_wkt_srs.cpp +++ b/gdal/frmts/gtiff/gt_wkt_srs.cpp @@ -702,9 +702,9 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) break; case CT_Stereographic: - oSRS.SetOS( adfParm[0], adfParm[1], - adfParm[4], - adfParm[5], adfParm[6] ); + oSRS.SetStereographic( adfParm[0], adfParm[1], + adfParm[4], + adfParm[5], adfParm[6] ); break; case CT_ObliqueMercator: /* hotine */ diff --git a/gdal/ogr/ogr_srs_esri.cpp b/gdal/ogr/ogr_srs_esri.cpp index 7681d31..91bbd5e 100644 --- a/gdal/ogr/ogr_srs_esri.cpp +++ b/gdal/ogr/ogr_srs_esri.cpp @@ -999,12 +999,12 @@ OGRErr OGRSpatialReference::morphToESRI() } /* -------------------------------------------------------------------- */ -/* OBLIQUE_STEREOGRAPHIC maps to ESRI Stereographic */ +/* OBLIQUE_STEREOGRAPHIC maps to ESRI Double_Stereographic */ /* -------------------------------------------------------------------- */ if( pszProjection != NULL && ( EQUAL(pszProjection,SRS_PT_OBLIQUE_STEREOGRAPHIC) )) { - SetNode( "PROJCS|PROJECTION", "Stereographic" ); + SetNode( "PROJCS|PROJECTION", "Double_Stereographic" ); } /* -------------------------------------------------------------------- */ diff --git a/gdal/ogr/ogr_srs_proj4.cpp b/gdal/ogr/ogr_srs_proj4.cpp index d6ed547..0408fb3 100644 --- a/gdal/ogr/ogr_srs_proj4.cpp +++ b/gdal/ogr/ogr_srs_proj4.cpp @@ -556,8 +556,7 @@ OGRErr OGRSpatialReference::importFromProj4( const char * pszProj4 ) OSR_GDV( papszNV, "y_0", 0.0 ) ); } - else if( EQUALN(pszProj,"stere",5) /* mostly sterea */ - && CSLFetchNameValue(papszNV,"k") != NULL ) + else if( EQUAL(pszProj,"sterea") ) { SetOS( OSR_GDV( papszNV, "lat_0", 0.0 ), OSR_GDV( papszNV, "lon_0", 0.0 ), @@ -570,7 +569,7 @@ OGRErr OGRSpatialReference::importFromProj4( const char * pszProj4 ) { SetStereographic( OSR_GDV( papszNV, "lat_0", 0.0 ), OSR_GDV( papszNV, "lon_0", 0.0 ), - 1.0, + OSR_GDV( papszNV, "k", 1.0 ), OSR_GDV( papszNV, "x_0", 0.0 ), OSR_GDV( papszNV, "y_0", 0.0 ) ); }