[GRASS-SVN] r63012 - in grass/branches/releasebranch_7_0: . include lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 03:20:46 -0800 (Wed, 26 Nov 2014)
New Revision: 63012

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/include/gis.h
   grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
libgis: G_OPT_M_NULL_VALUE added - make distclean NEEDED



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011

Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h	2014-11-26 11:20:06 UTC (rev 63011)
+++ grass/branches/releasebranch_7_0/include/gis.h	2014-11-26 11:20:46 UTC (rev 63012)
@@ -266,7 +266,8 @@
     G_OPT_M_COLR,               /*!< color rules */
     G_OPT_M_DIR,                /*!< directory input */    
     G_OPT_M_REGION,             /*!< saved region */
-
+    G_OPT_M_NULL_VALUE,         /*!< null value string */
+    
     G_OPT_STDS_INPUT,           /*!< old input space time dataset of type strds, str3ds or stvds */
     G_OPT_STDS_INPUTS,          /*!< old input space time datasets */
     G_OPT_STDS_OUTPUT,          /*!< new output space time dataset */

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 11:20:06 UTC (rev 63011)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 11:20:46 UTC (rev 63012)
@@ -102,6 +102,7 @@
    - G_OPT_M_COORDS
    - G_OPT_M_COLR
    - G_OPT_M_REGION
+   - G_OPT_M_NULL_VALUE
 
   - temporal GIS framework
    - G_OPT_STDS_INPUT
@@ -655,7 +656,16 @@
 	Opt->descriptions = G_color_rules_descriptions();
         Opt->gisprompt = "old,colortable,colortable";
 	break;
-
+        
+    case G_OPT_M_NULL_VALUE:
+        Opt->key = "null_value";
+        Opt->key_desc = "string";
+        Opt->type = TYPE_STRING;
+        Opt->required = NO;
+        Opt->multiple = NO;
+        Opt->description = _("String representing NULL value data cell");
+        break;
+        
     case G_OPT_M_REGION:
         Opt->key = "region";
         Opt->type = TYPE_STRING;