aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-01-21 19:31:02 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-01-22 00:10:23 +0100
commited462b39fb7d9b92a75a069da707f2b7921b2820 (patch)
tree61a99c6887ce7d853c7eaf1216d53ee191812a9a /src/iso19111
parenta4ec5e49bbcf3de1c779c3ed13389def99dd6a4e (diff)
downloadPROJ-ed462b39fb7d9b92a75a069da707f2b7921b2820.tar.gz
PROJ-ed462b39fb7d9b92a75a069da707f2b7921b2820.zip
proj_create_crs_to_crs(): defer selection of actual coordinate operation until proj_trans() is called (fixes #1229)
Diffstat (limited to 'src/iso19111')
-rw-r--r--src/iso19111/c_api.cpp2
-rw-r--r--src/iso19111/common.cpp4
-rw-r--r--src/iso19111/crs.cpp3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 06a3c02e..de11f181 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -337,7 +337,7 @@ PJ *proj_create(PJ_CONTEXT *ctx, const char *text) {
assert(text);
// Only connect to proj.db if needed
- if( strstr(text, "proj=") == nullptr || strstr(text, "init=") != nullptr ) {
+ if (strstr(text, "proj=") == nullptr || strstr(text, "init=") != nullptr) {
getDBcontextNoException(ctx, __FUNCTION__);
}
try {
diff --git a/src/iso19111/common.cpp b/src/iso19111/common.cpp
index ad816275..0e74fe07 100644
--- a/src/iso19111/common.cpp
+++ b/src/iso19111/common.cpp
@@ -642,9 +642,7 @@ const std::string &IdentifiedObject::remarks() PROJ_PURE_DEFN {
*
* \remark Extension of \ref ISO_19111_2018
*/
-bool IdentifiedObject::isDeprecated() PROJ_PURE_DEFN {
- return d->isDeprecated;
-}
+bool IdentifiedObject::isDeprecated() PROJ_PURE_DEFN { return d->isDeprecated; }
// ---------------------------------------------------------------------------
//! @cond Doxygen_Suppress
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 74b94a1f..1f03e262 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -1653,8 +1653,7 @@ CRSNNPtr GeographicCRS::_shallowClone() const {
*
* @return a EllipsoidalCS.
*/
-const cs::EllipsoidalCSNNPtr &
-GeographicCRS::coordinateSystem() PROJ_PURE_DEFN {
+const cs::EllipsoidalCSNNPtr &GeographicCRS::coordinateSystem() PROJ_PURE_DEFN {
return d->coordinateSystem_;
}