Merge pull request #3305 from OSGeo/backport-3300-to-9.1

[Backport 9.1] JSON output: avoid rounding issues with integer values in a double on…
OSGeo · Aug 27, 2022 · cc8970d · cc8970d
2 parents 7d3c242 + 6e791c1
commit cc8970d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/proj_json_streaming_writer.cpp b/src/proj_json_streaming_writer.cpp
@@ -28,6 +28,7 @@
 
 /*! @cond Doxygen_Suppress */
 
+#include <limits>
 #include <vector>
 #include <string>
 
@@ -277,6 +278,14 @@ void CPLJSonStreamingWriter::Add(double dfVal, int nPrecision)
     {
         Print( dfVal > 0 ? "\"Infinity\"" : "\"-Infinity\"" );
     }
+    else if( dfVal >= std::numeric_limits<int>::min() &&
+             dfVal <= std::numeric_limits<int>::max() &&
+             static_cast<int>(dfVal) == dfVal )
+    {
+        // Avoid rounding issues on some platforms like armel, with numbers
+        // like 2005. See https://github.com/OSGeo/PROJ/issues/3297
+        Print(CPLSPrintf("%d", static_cast<int>(dfVal)));
+    }
     else
     {
         char szFormatting[10];