[GRASS-SVN] r61363 - grass/branches/releasebranch_7_0/raster/r.in.gdal

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-07-23 02:43:05 -0700 (Wed, 23 Jul 2014)
New Revision: 61363

Modified:
   grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
Log:
r.in.gdal: GDALGetCacheMax() is limited to 2GiB, define valid range for memory parameter

Modified: grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c	2014-07-23 09:33:12 UTC (rev 61362)
+++ grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c	2014-07-23 09:43:05 UTC (rev 61363)
@@ -101,6 +101,7 @@
     parm.memory->key = "memory";
     parm.memory->type = TYPE_INTEGER;
     parm.memory->required = NO;
+    parm.memory->options = "0-2047";
     parm.memory->description = _("Cache size (MiB)");
 
     parm.target = G_define_option();
@@ -206,6 +207,7 @@
     GDALAllRegister();
     /* default GDAL memory cache size appears to be only 40 MiB, slowing down r.in.gdal */
     if (parm.memory->answer && *parm.memory->answer) {
+	   /* TODO: GDALGetCacheMax() overflows at 2GiB, implement use of GDALSetCacheMax64() */
            GDALSetCacheMax(atol(parm.memory->answer) * 1024 * 1024);
            G_verbose_message(_("Using user memory cache size: %.1f MiB"), GDALGetCacheMax()/1024.0/1024.0);
     } else