[GRASS-SVN] r72524 - grass/trunk/lib/proj
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Mar 23 02:55:57 PDT 2018
Author: mmetz
Date: 2018-03-23 02:55:57 -0700 (Fri, 23 Mar 2018)
New Revision: 72524
Modified:
grass/trunk/lib/proj/convert.c
grass/trunk/lib/proj/do_proj.c
Log:
libproj: fix GPJ_transform[_array] for PROJ 4
Modified: grass/trunk/lib/proj/convert.c
===================================================================
--- grass/trunk/lib/proj/convert.c 2018-03-23 09:54:22 UTC (rev 72523)
+++ grass/trunk/lib/proj/convert.c 2018-03-23 09:55:57 UTC (rev 72524)
@@ -860,7 +860,7 @@
if (strcmp(proj4_unit, gpj_units[i].id) == 0) {
if (pszUnitsName)
G_free(pszUnitsName);
- G_asprintf(&pszUnitsName, gpj_units[i].name);
+ G_asprintf(&pszUnitsName, "%s", gpj_units[i].name);
break;
}
i++;
Modified: grass/trunk/lib/proj/do_proj.c
===================================================================
--- grass/trunk/lib/proj/do_proj.c 2018-03-23 09:54:22 UTC (rev 72523)
+++ grass/trunk/lib/proj/do_proj.c 2018-03-23 09:55:57 UTC (rev 72524)
@@ -242,7 +242,7 @@
if (info_out == NULL)
G_fatal_error(_("No output projection"));
- if (dir == FWD) {
+ if (dir == PJ_FWD) {
p_in = info_in;
p_out = info_out;
}
@@ -445,7 +445,7 @@
/* PROJ 4 variant */
const struct pj_info *p_in, *p_out;
- if (dir == FWD) {
+ if (dir == PJ_FWD) {
p_in = info_in;
p_out = info_out;
}
More information about the grass-commit
mailing list