Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed Jul 23, 2012
2 parents 4018ca6 + c9f17ed commit d3bc6c781f1e3e59f144fb31df6ef07b12d588e1
Showing with 3 additions and 2 deletions.
  1. +3 −2 src/core/qgscoordinatereferencesystem.cpp
@@ -1645,6 +1645,7 @@ int QgsCoordinateReferenceSystem::syncDb()
sqlite3_stmt *select;
char *errMsg = NULL;

QString proj4;
QString sql;
QHash<int, QString> wkts;
loadIDs( wkts );
@@ -1665,7 +1666,7 @@ int QgsCoordinateReferenceSystem::syncDb()
if ( OSRExportToProj4( crs, &psz ) != OGRERR_NONE )
continue;

QString proj4( psz );
proj4 = psz;
proj4 = proj4.trimmed();

CPLFree( psz );
@@ -1774,7 +1775,7 @@ int QgsCoordinateReferenceSystem::syncDb()
}

#if !defined(PJ_VERSION) || PJ_VERSION!=470
QString sql = QString( "select auth_name,auth_id,parameters from tbl_srs WHERE auth_name<>'EPSG' WHERE NOT deprecated" );
sql = QString( "select auth_name,auth_id,parameters from tbl_srs WHERE auth_name<>'EPSG' WHERE NOT deprecated" );
if ( sqlite3_prepare( database, sql.toAscii(), sql.size(), &select, &tail ) == SQLITE_OK )
{
while ( sqlite3_step( select ) == SQLITE_ROW )

0 comments on commit d3bc6c7

Please sign in to comment.
You can’t perform that action at this time.