[GRASS-SVN] r72473 - grass/trunk/raster/r.latlong

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-03-21 11:20:27 -0700 (Wed, 21 Mar 2018)
New Revision: 72473

Modified:
   grass/trunk/raster/r.latlong/main.c
Log:
r.latlong: adjust support for PROJ 5+ API

Modified: grass/trunk/raster/r.latlong/main.c
===================================================================
--- grass/trunk/raster/r.latlong/main.c	2018-03-21 18:18:06 UTC (rev 72472)
+++ grass/trunk/raster/r.latlong/main.c	2018-03-21 18:20:27 UTC (rev 72473)
@@ -130,12 +130,8 @@
         {
 	    latitude = ymax - ((double)row * stepy);
 	    longitude = xmin + ((double)col * stepx);
-	    if (not_ll) 
-#ifdef HAVE_PROJ_H
+	    if (not_ll)
 		if (GPJ_do_proj_ll(&longitude, &latitude, &iproj, PJ_INV) < 0) 
-#else
-		if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0) 
-#endif
 		    G_fatal_error(_("Error in pj_do_proj"));
             if(flag1->answer)
 	        d = longitude;