[GRASS-SVN] r59926 - in grass/branches/releasebranch_7_0/raster: r.rescale r.rescale.eq

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-04-24 04:25:20 -0700 (Thu, 24 Apr 2014)
New Revision: 59926

Modified:
   grass/branches/releasebranch_7_0/raster/r.rescale.eq/main.c
   grass/branches/releasebranch_7_0/raster/r.rescale/main.c
Log:
Use the standard options (by hcho)
    (merge r59917 from trunk)


Modified: grass/branches/releasebranch_7_0/raster/r.rescale/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.rescale/main.c	2014-04-24 11:24:26 UTC (rev 59925)
+++ grass/branches/releasebranch_7_0/raster/r.rescale/main.c	2014-04-24 11:25:20 UTC (rev 59926)
@@ -52,11 +52,7 @@
 
     /* Define the different options */
 
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
-    parm.input->required = YES;
-    parm.input->gisprompt = "old,cell,raster";
+    parm.input = G_define_standard_option(G_OPT_R_INPUT);
     parm.input->description = _("The name of the raster map to be rescaled");
 
     parm.from = G_define_option();
@@ -67,11 +63,7 @@
     parm.from->description =
 	_("The input data range to be rescaled (default: full range of input map)");
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
-    parm.output->required = YES;
-    parm.output->gisprompt = "new,cell,raster";
+    parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.output->description = _("The resulting raster map name");
 
     parm.to = G_define_option();

Modified: grass/branches/releasebranch_7_0/raster/r.rescale.eq/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.rescale.eq/main.c	2014-04-24 11:24:26 UTC (rev 59925)
+++ grass/branches/releasebranch_7_0/raster/r.rescale.eq/main.c	2014-04-24 11:25:20 UTC (rev 59926)
@@ -57,11 +57,7 @@
 
     /* Define the different options */
 
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
-    parm.input->required = YES;
-    parm.input->gisprompt = "old,cell,raster";
+    parm.input = G_define_standard_option(G_OPT_R_INPUT);
     parm.input->description = _("The name of the raster map to be rescaled");
 
     parm.from = G_define_option();
@@ -72,11 +68,7 @@
     parm.from->description =
 	_("The input data range to be rescaled (default: full range of input map)");
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
-    parm.output->required = YES;
-    parm.output->gisprompt = "new,cell,raster";
+    parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.output->description = _("The resulting raster map name");
 
     parm.to = G_define_option();