瀏覽代碼

r.sunhours: adjust support for PROJ 5+ API

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72476 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 年之前
父節點
當前提交
ea07e6fb04
共有 1 個文件被更改,包括 0 次插入8 次删除
  1. 0 8
      raster/r.sunhours/main.c

+ 0 - 8
raster/r.sunhours/main.c

@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
 	    north_ll = (window.north + window.south) / 2;
 	    east_ll = (window.east + window.west) / 2;
 	    if (do_reproj) {
-#ifdef HAVE_PROJ_H
 		if (GPJ_do_proj_ll(&east_ll, &north_ll, &iproj, PJ_INV) < 0)
-#else
-		if (pj_do_proj(&east_ll, &north_ll, &iproj, &oproj) < 0)
-#endif
 		    G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 	    }
 	    pd.timezone = east_ll / 15.;
@@ -392,11 +388,7 @@ int main(int argc, char *argv[])
 
 	    if (do_reproj) {
 		north_ll = north;
-#ifdef HAVE_PROJ_H
 		if (GPJ_do_proj_ll(&east_ll, &north_ll, &iproj, PJ_INV) < 0)
-#else
-		if (pj_do_proj(&east_ll, &north_ll, &iproj, &oproj) < 0)
-#endif
 		    G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 	    }