Use PJ_CONTEXT* instead of void*

qgis · Jan 22, 2020 · 2bf0e9f · 2bf0e9f
1 parent 8a71091
commit 2bf0e9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -693,7 +693,7 @@ bool QgsCoordinateReferenceSystem::loadFromDatabase( const QString &db, const QS
 }
 
 #if PROJ_VERSION_MAJOR>=6
-void QgsCoordinateReferenceSystem::removeFromCacheObjectsBelongingToCurrentThread( void *pj_context )
+void QgsCoordinateReferenceSystem::removeFromCacheObjectsBelongingToCurrentThread( PJ_CONTEXT *pj_context )
 {
   // Not completely sure about object order destruction after main() has
   // exited. So it is safer to check sDisableCache before using sCacheLock

diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -44,6 +44,10 @@ class QgsCoordinateReferenceSystemPrivate;
 #ifndef SIP_RUN
 struct PJconsts;
 typedef struct PJconsts PJ;
+
+struct projCtx_t;
+typedef struct projCtx_t PJ_CONTEXT;
+
 #endif
 #endif
 
@@ -960,7 +964,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
     friend class QgsProjContext;
 
     // Only meant to be called by QgsProjContext::~QgsProjContext()
-    static void removeFromCacheObjectsBelongingToCurrentThread( void *pj_context );
+    static void removeFromCacheObjectsBelongingToCurrentThread( PJ_CONTEXT *pj_context );
 #endif
 
     //! Function for CRS validation. May be NULLPTR.

diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
@@ -155,7 +155,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
 
 #if PROJ_VERSION_MAJOR>=6
     mutable QReadWriteLock mProjLock;
-    mutable QMap < uintptr_t, PJ * > mProjObjects;
+    mutable QMap < PJ_CONTEXT *, PJ * > mProjObjects;
 
     PJ *threadLocalProjObject() const
     {
@@ -164,7 +164,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
         return nullptr;
 
       PJ_CONTEXT *context = QgsProjContext::get();
-      QMap < uintptr_t, PJ * >::const_iterator it = mProjObjects.constFind( reinterpret_cast< uintptr_t>( context ) );
+      QMap < PJ_CONTEXT *, PJ * >::const_iterator it = mProjObjects.constFind( context );
 
       if ( it != mProjObjects.constEnd() )
       {
@@ -175,16 +175,16 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
       locker.changeMode( QgsReadWriteLocker::Write );
 
       PJ *res = proj_clone( context, mPj.get() );
-      mProjObjects.insert( reinterpret_cast< uintptr_t>( context ), res );
+      mProjObjects.insert( context, res );
       return res;
     }
 
     // Only meant to be called by QgsCoordinateReferenceSystem::removeFromCacheObjectsBelongingToCurrentThread()
-    bool removeObjectsBelongingToCurrentThread( void *pj_context )
+    bool removeObjectsBelongingToCurrentThread( PJ_CONTEXT *pj_context )
     {
       QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Write );
 
-      QMap < uintptr_t, PJ * >::iterator it = mProjObjects.find( reinterpret_cast< uintptr_t>( pj_context ) );
+      QMap < PJ_CONTEXT *, PJ * >::iterator it = mProjObjects.find( pj_context );
       if ( it != mProjObjects.end() )
       {
         proj_destroy( it.value() );