← Back to branch summary

~ubuntu-branches/ubuntu/precise/grass/precise

« back to all changes in this revision

Viewing changes to raster/r.random/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine
  • Date: 2011-04-13 17:08:41 UTC
  • mfrom: (8.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110413170841-ss1t9bic0d0uq0gz
Tags: 6.4.1-1
* New upstream version.
* Now build-dep on libjpeg-dev and current libreadline6-dev.
* Removed patch swig: obsolete.
* Policy bumped to 3.9.2, without changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
raster/r.random/main.c
42
42
    } parm;
43
43
    struct
44
44
    {
45
 
        struct Flag *zero, *info, *z_geometry;
 
45
        struct Flag *zero, *info, *z_geometry, *notopol_flag;
46
46
    } flag;
47
47
 
48
48
    G_gisinit(argv[0]);
89
89
    flag.z_geometry->key = 'd';
90
90
    flag.z_geometry->description = _("Generate vector points as 3D points");
91
91
 
 
92
    flag.notopol_flag = G_define_flag();
 
93
    flag.notopol_flag->key = 'b';
 
94
    flag.notopol_flag->description = _("Do not build topology in points mode");
 
95
    flag.notopol_flag->guisection = _("Points");
 
96
 
92
97
    if (G_parser(argc, argv) != 0)
93
98
        exit(EXIT_FAILURE);
94
99
 
96
101
    myState.use_nulls = flag.zero->answer;
97
102
    myState.inraster = parm.input->answer;
98
103
    if (parm.cover->answer) {
99
 
        myState.docover = 1;
 
104
        myState.docover = TRUE;
100
105
        myState.inrcover = parm.cover->answer;
101
106
    }
102
107
    else {
103
 
        myState.docover = 0;
 
108
        myState.docover = FALSE;
104
109
        myState.cmapset = NULL;
105
110
        myState.inrcover = NULL;
106
111
    }
107
112
    myState.outraster = parm.raster->answer;
108
113
    myState.outvector = parm.sites->answer;
109
114
    myState.z_geometry = flag.z_geometry->answer;
 
115
    myState.notopol = flag.notopol_flag->answer;
110
116
 
111
117
    myState.mapset = G_find_cell(myState.inraster, "");
112
118
    if (myState.mapset == NULL)
113
119
        G_fatal_error(_("Raster map <%s> not found"), myState.inraster);
114
120
 
115
 
    if (myState.docover == 1) {
 
121
    if (myState.docover == TRUE) {
116
122
        myState.cmapset = G_find_cell(myState.inrcover, "");
117
123
        if (myState.cmapset == NULL)
118
124
            G_fatal_error(_("Raster map <%s> not found"), myState.inrcover);