[GRASS-SVN] r60484 - grass/trunk/raster/r.external.out

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-05-25 14:39:04 -0700 (Sun, 25 May 2014)
New Revision: 60484

Modified:
   grass/trunk/raster/r.external.out/main.c
Log:
r.external.out: fix r60483

Modified: grass/trunk/raster/r.external.out/main.c
===================================================================
--- grass/trunk/raster/r.external.out/main.c	2014-05-25 21:31:01 UTC (rev 60483)
+++ grass/trunk/raster/r.external.out/main.c	2014-05-25 21:39:04 UTC (rev 60484)
@@ -73,7 +73,7 @@
 #ifdef GDAL_DCAP_RASTER
             /* Starting with GDAL 2.0, vector drivers can also be returned */
             /* Only keep raster drivers */
-            if (!GDALGetMetadataItem(hDriver, GDAL_DCAP_RASTER, NULL))
+            if (!GDALGetMetadataItem(driver, GDAL_DCAP_RASTER, NULL))
                 continue;
 #endif
 
@@ -91,6 +91,13 @@
 	GDALDriverH driver = GDALGetDriver(i);
 	const char *name;
 
+#ifdef GDAL_DCAP_RASTER
+            /* Starting with GDAL 2.0, vector drivers can also be returned */
+            /* Only keep raster drivers */
+            if (!GDALGetMetadataItem(driver, GDAL_DCAP_RASTER, NULL))
+                continue;
+#endif
+
 	if (!GDALGetMetadataItem(driver, GDAL_DCAP_CREATE, NULL) &&
 	    !GDALGetMetadataItem(driver, GDAL_DCAP_CREATECOPY, NULL))
 	    continue;