Explorar o código

Fix handling of memory size (conversion of int to size_t)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47641 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements %!s(int64=13) %!d(string=hai) anos
pai
achega
94f535f55d
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      raster/r.terraflow/main.cc

+ 2 - 2
raster/r.terraflow/main.cc

@@ -319,7 +319,7 @@ void record_args(int argc, char **argv) {
   sprintf(buf, "D8CUT=%f", opt->d8cut);
   stats->comment(buf);
 
-  size_t mm_size = opt->mem  << 20; /* (in bytes) */
+  size_t mm_size = (size_t) opt->mem  << 20; /* (in bytes) */
   char tmp[100];
   formatNumber(tmp, mm_size);
   sprintf(buf, "Memory size: %s bytes", tmp);
@@ -506,7 +506,7 @@ main(int argc, char *argv[]) {
   }
 
   /* set up STREAM memory manager */
-  size_t mm_size = opt->mem << 20; /* opt->mem is in MB */
+  size_t mm_size = (size_t) opt->mem << 20; /* opt->mem is in MB */
   MM_manager.set_memory_limit(mm_size);
   if (opt->verbose) {
 	MM_manager.warn_memory_limit();