Merge remote-tracking branch 'osgeo/master'

1 files changed, 18 insertions, 13 deletions

diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
index 0bf98b3a..0108cb74 100644
--- a/src/apps/proj.cpp
+++ b/src/apps/proj.cpp
@@ -9,6 +9,8 @@
 #include "emess.h"
 #include "utils.h"
 
+#include <vector>
+
 #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__WIN32__)
 #  include <fcntl.h>
 #  include <io.h>
@@ -171,6 +173,7 @@ static void process(FILE *fid) {
                 (void)fputs("\t<* * * * * *>", stdout);
         }
         (void)fputs(bin_in ? "\n" : s, stdout);
+        fflush(stdout);
     }
 }
 
@@ -249,10 +252,8 @@ static void vprocess(FILE *fid) {
             if (postscale) { dat_xy.x *= fscale; dat_xy.y *= fscale; }
         }
 
-        /* For some reason pj_errno does not work as expected in some   */
-        /* versions of Visual Studio, so using pj_get_errno_ref instead */
-        if (*pj_get_errno_ref()) {
-            emess(-1, pj_strerrno(*pj_get_errno_ref()));
+        if (proj_context_errno(nullptr)) {
+            emess(-1, proj_errno_string(proj_context_errno(nullptr)));
             continue;
         }
 
@@ -286,15 +287,17 @@ static void vprocess(FILE *fid) {
         (void)fputs(proj_rtodms(pline, facs.meridian_convergence, 0, 0), stdout);
         (void)printf(" [ %.8f ]\n", facs.meridian_convergence * RAD_TO_DEG);
         (void)printf("Max-min (Tissot axis a-b) scale error: %.5f %.5f\n\n", facs.tissot_semimajor, facs.tissot_semiminor);
+
+        fflush(stdout);
     }
 }
 
 int main(int argc, char **argv) {
     char *arg;
-    char *pargv[MAX_PARGS] = {};
+    std::vector<char*> argvVector;
     char **eargv = argv;
     FILE *fid;
-    int pargc = 0, eargc = 0, mon = 0;
+    int eargc = 0, mon = 0;
 
     if ( (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR)) != nullptr)
         ++emess_dat.Prog_name;
@@ -449,10 +452,7 @@ int main(int argc, char **argv) {
             }
             break;
         } else if (**argv == '+') { /* + argument */
-            if (pargc < MAX_PARGS)
-                pargv[pargc++] = *argv + 1;
-            else
-                emess(1,"overflowed + argument table");
+            argvVector.push_back(*argv + 1);
         } else /* assumed to be input file name(s) */
             eargv[eargc++] = *argv;
     }
@@ -472,9 +472,14 @@ int main(int argc, char **argv) {
         postscale = 0;
         fscale = 1./fscale;
     }
-    if (!(Proj = pj_init(pargc, pargv)))
+    proj_context_use_proj4_init_rules(nullptr, true);
+
+    // proj historically ignores any datum shift specifier, like nadgrids, towgs84, etc
+    argvVector.push_back(const_cast<char*>("break_cs2cs_recursion"));
+
+    if (!(Proj = proj_create_argv(nullptr, static_cast<int>(argvVector.size()), argvVector.data())))
         emess(3,"projection initialization failure\ncause: %s",
-              pj_strerrno(pj_errno));
+              proj_errno_string(proj_context_errno(nullptr)));
 
     if (!proj_angular_input(Proj, PJ_FWD)) {
         emess(3, "can't initialize operations that take non-angular input coordinates");
@@ -559,7 +564,7 @@ int main(int argc, char **argv) {
     }
 
     if( Proj )
-        pj_free(Proj);
+        proj_destroy(Proj);
 
     exit(0); /* normal completion */
 }