diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-13 11:15:03 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-13 11:15:03 +0100 |
| commit | c9d6d364a86054f1dddbeb772660375be47aa23b (patch) | |
| tree | b67610d75232ed545c0dbe384f5be988187b032b /src | |
| parent | a2b2663d2a35c9ff6ff56e9348f166a99cc618a4 (diff) | |
| download | PROJ-c9d6d364a86054f1dddbeb772660375be47aa23b.tar.gz PROJ-c9d6d364a86054f1dddbeb772660375be47aa23b.zip | |
Fix compilation breakage of previous commit with some compilers
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/crs.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index ad4728b8..46aeee20 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -49,6 +49,7 @@ #include <algorithm> #include <cassert> +#include <cmath> #include <cstring> #include <iostream> #include <memory> @@ -610,12 +611,12 @@ static bool mustAxisOrderBeSwitchedForVisualizationInternal( const auto &meridian0 = axisList[0]->meridian(); const auto &meridian1 = axisList[1]->meridian(); return meridian0 != nullptr && meridian1 != nullptr && - fabs(meridian0->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 180.0) < 1e-10 && - fabs(meridian1->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 90.0) < 1e-10; + std::abs(meridian0->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 180.0) < 1e-10 && + std::abs(meridian1->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 90.0) < 1e-10; } // Address EPSG:32761 "WGS 84 / UPS South (N,E)" @@ -624,12 +625,12 @@ static bool mustAxisOrderBeSwitchedForVisualizationInternal( const auto &meridian0 = axisList[0]->meridian(); const auto &meridian1 = axisList[1]->meridian(); return meridian0 != nullptr && meridian1 != nullptr && - fabs(meridian0->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 0.0) < 1e-10 && - fabs(meridian1->longitude().convertToUnit( - common::UnitOfMeasure::DEGREE) - - 90.0) < 1e-10; + std::abs(meridian0->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 0.0) < 1e-10 && + std::abs(meridian1->longitude().convertToUnit( + common::UnitOfMeasure::DEGREE) - + 90.0) < 1e-10; } return false; |
