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

Fix proj4 build

Browse Source
This commit is contained in:
Nyall Dawson 2019-05-27 15:24:57 +10:00
parent c82d3b643f
commit ba764b0d9f
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/qgscoordinatetransform.cpp
View File

@ -63,6 +63,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
if ( !d->checkValidity() )
return;
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -72,6 +73,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &destination, const QgsProject *project )
@ -86,6 +88,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
if ( !d->checkValidity() )
return;
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -95,6 +98,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem &source, const QgsCoordinateReferenceSystem &destination, int sourceDatumTransform, int destinationDatumTransform )
@ -107,6 +111,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
if ( !d->checkValidity() )
return;
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -116,6 +121,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateTransform &o )
@ -147,6 +153,7 @@ void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem &c
return;
d->calculateTransforms( mContext );
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -156,6 +163,7 @@ void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem &c
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
void QgsCoordinateTransform::setDestinationCrs( const QgsCoordinateReferenceSystem &crs )
{
@ -165,6 +173,7 @@ void QgsCoordinateTransform::setDestinationCrs( const QgsCoordinateReferenceSyst
return;
d->calculateTransforms( mContext );
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -174,6 +183,7 @@ void QgsCoordinateTransform::setDestinationCrs( const QgsCoordinateReferenceSyst
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
void QgsCoordinateTransform::setContext( const QgsCoordinateTransformContext &context )
@ -187,6 +197,7 @@ void QgsCoordinateTransform::setContext( const QgsCoordinateTransformContext &co
return;
d->calculateTransforms( mContext );
Q_NOWARN_DEPRECATED_PUSH
#if PROJ_VERSION_MAJOR>=6
if ( !setFromCache( d->mSourceCRS, d->mDestCRS, d->mProjCoordinateOperation ) )
#else
@ -196,6 +207,7 @@ void QgsCoordinateTransform::setContext( const QgsCoordinateTransformContext &co
d->initialize();
addToCache();
}
Q_NOWARN_DEPRECATED_POP
}
QgsCoordinateTransformContext QgsCoordinateTransform::context() const
@ -861,6 +873,7 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
const QList< QgsCoordinateTransform > values = sTransforms.values( qMakePair( src.authid(), dest.authid() ) );
for ( auto valIt = values.constBegin(); valIt != values.constEnd(); ++valIt )
{
Q_NOWARN_DEPRECATED_PUSH
if ( ( *valIt ).sourceDatumTransformId() == srcDatumTransform &&
( *valIt ).destinationDatumTransformId() == destDatumTransform )
{
@ -879,6 +892,7 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
return true;
}
Q_NOWARN_DEPRECATED_POP
}
sCacheLock.unlock();
return false;

2
src/core/qgscoordinatetransform_p.cpp
View File

@ -342,8 +342,10 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
#endif
#else
#ifdef USE_THREAD_LOCAL
Q_NOWARN_DEPRECATED_PUSH
QPair<projPJ, projPJ> res = qMakePair( pj_init_plus_ctx( mProjContext.get(), mSourceProjString.toUtf8() ),
pj_init_plus_ctx( mProjContext.get(), mDestProjString.toUtf8() ) );
Q_NOWARN_DEPRECATED_POP
mProjProjections.insert( reinterpret_cast< uintptr_t>( mProjContext.get() ), res );
#else
QPair<projPJ, projPJ> res = qMakePair( pj_init_plus_ctx( pContext, mSourceProjString.toUtf8() ),

5
src/core/qgscoordinatetransformcontext.cpp
View File

@ -82,7 +82,7 @@ QMap<QPair<QString, QString>, QString> QgsCoordinateTransformContext::coordinate
d->mLock.unlock();
return res;
#else
return QMap<QPair<QString, QString>, QgsDatumTransform::TransformDetails>();
return QMap<QPair<QString, QString>, QString>();
#endif
}
@ -114,8 +114,7 @@ bool QgsCoordinateTransformContext::addCoordinateOperation( const QgsCoordinateR
d->mLock.unlock();
return true;
#else
Q_UNUSED( sourceTransform )
Q_UNUSED( destinationTransform )
Q_UNUSED( coordinateOperationProjString )
return false;
#endif
}