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 missing cache skip in proj 6 code path

Browse Source
This commit is contained in:
Nyall Dawson 2019-07-19 15:25:42 +10:00
parent cb6ef056cf
commit 46807c7eaf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/qgscoordinatetransform.cpp
View File

@ -821,7 +821,10 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
if ( sourceKey.isEmpty() || destKey.isEmpty() ) if ( sourceKey.isEmpty() || destKey.isEmpty() )
return false; return false;
sCacheLock.lockForRead(); QgsReadWriteLocker locker( sCacheLock, QgsReadWriteLocker::Read );
if ( sDisableCache )
return false;
const QList< QgsCoordinateTransform > values = sTransforms.values( qMakePair( sourceKey, destKey ) ); const QList< QgsCoordinateTransform > values = sTransforms.values( qMakePair( sourceKey, destKey ) );
for ( auto valIt = values.constBegin(); valIt != values.constEnd(); ++valIt ) for ( auto valIt = values.constBegin(); valIt != values.constEnd(); ++valIt )
{ {
@ -833,7 +836,7 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
bool hasContext = mHasContext; bool hasContext = mHasContext;
#endif #endif
*this = *valIt; *this = *valIt;
sCacheLock.unlock(); locker.unlock();
mContext = context; mContext = context;
#ifdef QGISDEBUG #ifdef QGISDEBUG
@ -843,7 +846,6 @@ bool QgsCoordinateTransform::setFromCache( const QgsCoordinateReferenceSystem &s
return true; return true;
} }
} }
sCacheLock.unlock();
return false; return false;
} }
#else #else