[GRASS-SVN] r72099 - in grass/branches/releasebranch_7_4: include/Make lib lib/raster

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-01-19 09:51:04 -0800 (Fri, 19 Jan 2018)
New Revision: 72099

Modified:
   grass/branches/releasebranch_7_4/include/Make/Grass.make
   grass/branches/releasebranch_7_4/lib/Makefile
   grass/branches/releasebranch_7_4/lib/raster/gdal.c
Log:
r.external.out: write CRS (#3059, backport trunk r72098)

Modified: grass/branches/releasebranch_7_4/include/Make/Grass.make
===================================================================
--- grass/branches/releasebranch_7_4/include/Make/Grass.make	2018-01-19 17:43:52 UTC (rev 72098)
+++ grass/branches/releasebranch_7_4/include/Make/Grass.make	2018-01-19 17:51:04 UTC (rev 72099)
@@ -213,7 +213,7 @@
 OGSFDEPS         = $(BITMAPLIB) $(RASTER3DLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB) $(TIFFLIBPATH) $(TIFFLIB) $(OPENGLLIB) $(OPENGLULIB) $(MATHLIB)
 PNGDRIVERDEPS    = $(DRIVERLIB) $(GISLIB) $(PNGLIB) $(MATHLIB)
 PSDRIVERDEPS     = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
-RASTERDEPS       = $(GISLIB) $(MATHLIB)
+RASTERDEPS       = $(GISLIB) $(GPROJLIB) $(MATHLIB)
 RLIDEPS          = $(RASTERLIB) $(GISLIB) $(MATHLIB)
 ROWIODEPS        = $(GISLIB)
 RTREEDEPS        = $(GISLIB) $(MATHLIB)

Modified: grass/branches/releasebranch_7_4/lib/Makefile
===================================================================
--- grass/branches/releasebranch_7_4/lib/Makefile	2018-01-19 17:43:52 UTC (rev 72098)
+++ grass/branches/releasebranch_7_4/lib/Makefile	2018-01-19 17:51:04 UTC (rev 72099)
@@ -6,6 +6,7 @@
 SUBDIRS = \
 	datetime \
 	gis \
+	proj \
 	raster \
 	external \
 	gmath \
@@ -21,7 +22,6 @@
 	display \
 	db \
 	fonts \
-	proj \
 	vector \
 	imagery \
 	cluster \

Modified: grass/branches/releasebranch_7_4/lib/raster/gdal.c
===================================================================
--- grass/branches/releasebranch_7_4/lib/raster/gdal.c	2018-01-19 17:43:52 UTC (rev 72098)
+++ grass/branches/releasebranch_7_4/lib/raster/gdal.c	2018-01-19 17:51:04 UTC (rev 72099)
@@ -18,6 +18,7 @@
 #include <grass/config.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
+#include <grass/gprojects.h>
 #include <grass/glocale.h>
 
 #include "R.h"
@@ -431,12 +432,8 @@
 	read_gdal_options();
 	st->projinfo = G_get_projinfo();
 	st->projunits = G_get_projunits();
-#if 0
-	/* We cannot use GPJ_grass_to_wkt() here because that would create a
-	   circular dependency between libgis and libgproj */
 	if (st->projinfo && st->projunits)
-	    st->srswkt = GPJ_grass_to_wkt(st->projinfo, st->projunits);
-#endif
+	    st->srswkt = GPJ_grass_to_wkt(st->projinfo, st->projunits, 0, 0);
 	G_initialize_done(&st->initialized);
     }