Navigation Menu

Skip to content

Commit

Permalink
Fix build on proj <6
Browse files Browse the repository at this point in the history
(cherry picked from commit 6490a17)
  • Loading branch information
nyalldawson committed Dec 20, 2019
1 parent 1cdf23c commit 7105b4b
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/core/qgsprojutils.h
Expand Up @@ -63,6 +63,14 @@ class CORE_EXPORT QgsProjUtils
static QStringList searchPaths();

#ifndef SIP_RUN

//! Flags controlling CRS identification behavior
enum IdentifyFlag
{
FlagMatchBoundCrsToUnderlyingSourceCrs = 1 << 0, //!< Allow matching a BoundCRS object to its underlying SourceCRS
};
Q_DECLARE_FLAGS( IdentifyFlags, IdentifyFlag )

#if PROJ_VERSION_MAJOR >= 6

/**
Expand Down Expand Up @@ -103,13 +111,6 @@ class CORE_EXPORT QgsProjUtils
*/
static proj_pj_unique_ptr crsToSingleCrs( const PJ *crs );

//! Flags controlling CRS identification behavior
enum IdentifyFlag
{
FlagMatchBoundCrsToUnderlyingSourceCrs = 1 << 0, //!< Allow matching a BoundCRS object to its underlying SourceCRS
};
Q_DECLARE_FLAGS( IdentifyFlags, IdentifyFlag )

/**
* Attempts to identify a \a crs, matching it to a known authority and code within
* an acceptable level of tolerance.
Expand Down

0 comments on commit 7105b4b

Please sign in to comment.