diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-11-15 16:09:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 16:09:38 +0100 |
| commit | 214f086ab61f9964cbabccb9c002c915e2870539 (patch) | |
| tree | 464bcc71f6468d0498f9fce7441c06c78bc1bba4 /src/coordinateoperation.cpp | |
| parent | 4ad1477c24c3da4be6c7962606e6f9d47336b6a3 (diff) | |
| parent | 92d5abac3d402a8d2cbaee972bd39c4885de9fef (diff) | |
| download | PROJ-214f086ab61f9964cbabccb9c002c915e2870539.tar.gz PROJ-214f086ab61f9964cbabccb9c002c915e2870539.zip | |
Merge pull request #1176 from rouault/cond_test_build
Condtional build of test subdir + warning fix
Diffstat (limited to 'src/coordinateoperation.cpp')
| -rw-r--r-- | src/coordinateoperation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/coordinateoperation.cpp b/src/coordinateoperation.cpp index 645bd0ed..33e6f422 100644 --- a/src/coordinateoperation.cpp +++ b/src/coordinateoperation.cpp @@ -4329,7 +4329,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { common::Length( parameterValueMeasure(EPSG_CODE_PARAMETER_FALSE_NORTHING))); conv->setCRSs(this, false); - return conv; + return std::move(conv); } if (current_epsg_code == EPSG_CODE_METHOD_MERCATOR_VARIANT_B && @@ -4350,7 +4350,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { common::Length( parameterValueMeasure(EPSG_CODE_PARAMETER_FALSE_NORTHING))); conv->setCRSs(this, false); - return conv; + return std::move(conv); } if (current_epsg_code == EPSG_CODE_METHOD_LAMBERT_CONIC_CONFORMAL_1SP && @@ -4385,7 +4385,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { common::Length( parameterValueMeasure(EPSG_CODE_PARAMETER_FALSE_NORTHING))); conv->setCRSs(this, false); - return conv; + return std::move(conv); } else { const double K = k0 * m0 / std::pow(t0, n); const double phi1 = @@ -4441,7 +4441,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { EPSG_CODE_PARAMETER_FALSE_EASTING)), common::Length(FN_corrected_rounded)); conv->setCRSs(this, false); - return conv; + return std::move(conv); } } @@ -4455,7 +4455,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { parameterValueMeasure(EPSG_CODE_PARAMETER_FALSE_EASTING)), common::Length(FN)); conv->setCRSs(this, false); - return conv; + return std::move(conv); } } @@ -4519,7 +4519,7 @@ ConversionPtr Conversion::convertToOtherMethod(int targetEPSGCode) const { EPSG_CODE_PARAMETER_NORTHING_FALSE_ORIGIN) + (std::fabs(FN_correction) > 1e-8 ? FN_correction : 0))); conv->setCRSs(this, false); - return conv; + return std::move(conv); } return nullptr; |