sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #3602

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15465 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2011-03-13 19:51:40 +00:00
parent 9cca04da3e
commit 8391d1a870
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/grass/qgsgrassnewmapset.cpp
View File

@ -433,11 +433,11 @@ void QgsGrassNewMapset::setGrassProjection()
}
else
{
#ifdef QGISDEBUG
char *wkt = NULL;
QgsDebugMsg( QString( "OSRIsGeographic = %1" ).arg( OSRIsGeographic( hCRS ) ) );
QgsDebugMsg( QString( "OSRIsProjected = %1" ).arg( OSRIsProjected( hCRS ) ) );
char *wkt = NULL;
if (( errcode = OSRExportToWkt( hCRS, &wkt ) ) != OGRERR_NONE )
{
QgsDebugMsg( QString( "OGR can't get Wkt-style parameter string\nOGR Error code was %1" ).arg( errcode ) );
@ -446,27 +446,21 @@ void QgsGrassNewMapset::setGrassProjection()
{
QgsDebugMsg( QString( "wkt = %1" ).arg( wkt ) );
}
#endif
int ret;
// Note: GPJ_osr_to_grass() defaults in PROJECTION_XY if projection
// cannot be set
// There was a bug in GRASS, it is present in 6.0.x line
#if GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 1
ret = GPJ_osr_to_grass( &mCellHead, &mProjInfo,
&mProjUnits, hCRS, 0 );
#else
// Buggy version:
ret = GPJ_osr_to_grass( &mCellHead, &mProjInfo,
&mProjUnits, ( void ** )hCRS, 0 );
#endif
ret = GPJ_wkt_to_grass( &mCellHead, &mProjInfo, &mProjUnits, wkt, 0 );
// Note: It seems that GPJ_osr_to_grass()returns always 1,
// -> test if mProjInfo was set
QgsDebugMsg( QString( "ret = %1" ).arg( ret ) );
QgsDebugMsg( QString( "mProjInfo = %1" ).arg( QString::number(( qulonglong )mProjInfo, 16 ).toLocal8Bit().constData() ) );
OGRFree( wkt );
}
if ( !mProjInfo || !mProjUnits )