[GRASS-SVN] r72510 - grass/trunk/general/g.proj

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-03-23 02:21:24 -0700 (Fri, 23 Mar 2018)
New Revision: 72510

Modified:
   grass/trunk/general/g.proj/output.c
Log:
g.proj: use new GRASS API for coordinate transformation

Modified: grass/trunk/general/g.proj/output.c
===================================================================
--- grass/trunk/general/g.proj/output.c	2018-03-23 09:20:50 UTC (rev 72509)
+++ grass/trunk/general/g.proj/output.c	2018-03-23 09:21:24 UTC (rev 72510)
@@ -121,13 +121,6 @@
     return;
 }
 
-/* TODO: remove hack for PROJ 5+ */
-#ifdef HAVE_PROJ_H
-char *pj_get_def(PJ *, int);
-void pj_dalloc(void *);
-void pj_free(PJ *);
-#endif
-
 void print_proj4(int dontprettify)
 {
     struct pj_info pjinfo;
@@ -138,9 +131,13 @@
 	return;
 
     if (pj_get_kv(&pjinfo, projinfo, projunits) == -1)
-        G_fatal_error(_("Unable to convert projection information to PROJ.4 format"));
-    proj4 = pj_get_def(pjinfo.pj, 0);
+        G_fatal_error(_("Unable to convert projection information to PROJ format"));
+    proj4 = pjinfo.def;
+#ifdef HAVE_PROJ_H
+    proj_destroy(pjinfo.pj);
+#else
     pj_free(pjinfo.pj);
+#endif
     /* GRASS-style PROJ.4 strings don't include a unit factor as this is
      * handled separately in GRASS - must include it here though */
     unfact = G_find_key_value("meters", projunits);
@@ -148,7 +145,6 @@
 	G_asprintf(&proj4mod, "%s +to_meter=%s", proj4, unfact);
     else
 	proj4mod = G_store(proj4);
-    pj_dalloc(proj4);
 
     for (i = proj4mod; *i; i++) {
 	/* Don't print the first space */