Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix support for proj >7.2
  • Loading branch information
github-actions[bot] authored and jef-n committed Dec 4, 2020
1 parent 8145b3b commit 5465dd3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion src/core/qgscoordinatereferencesystem.h
Expand Up @@ -45,9 +45,13 @@ class QgsCoordinateReferenceSystemPrivate;
struct PJconsts;
typedef struct PJconsts PJ;

#if PROJ_VERSION_MAJOR>=8
struct pj_ctx;
typedef struct pj_ctx PJ_CONTEXT;
#else
struct projCtx_t;
typedef struct projCtx_t PJ_CONTEXT;

#endif
#endif
#endif

Expand Down
5 changes: 4 additions & 1 deletion src/core/qgsprojutils.h
Expand Up @@ -144,7 +144,10 @@ class CORE_EXPORT QgsProjUtils

#ifndef SIP_RUN

#if PROJ_VERSION_MAJOR>=6
#if PROJ_VERSION_MAJOR>=8
struct pj_ctx;
typedef struct pj_ctx PJ_CONTEXT;
#elif PROJ_VERSION_MAJOR>=6
struct projCtx_t;
typedef struct projCtx_t PJ_CONTEXT;
#else
Expand Down

0 comments on commit 5465dd3

Please sign in to comment.