Browse Source

r.in.gdal: Starting with GDAL 2.0, vector drivers can also be returned (fix -f flag)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60479 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 11 years ago
parent
commit
a2025513b0
1 changed files with 7 additions and 0 deletions
  1. 7 0
      raster/r.in.gdal/main.c

+ 7 - 0
raster/r.in.gdal/main.c

@@ -221,6 +221,13 @@ int main(int argc, char *argv[])
 	    GDALDriverH hDriver = GDALGetDriver(iDr);
 	    const char *pszRWFlag;
 
+#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))
+                continue;
+#endif
+
 	    if (GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATE, NULL))
 		pszRWFlag = "rw+";
 	    else if (GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATECOPY, NULL))