← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to raster/r.watershed/seg/dseg_open.c

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
raster/r.watershed/seg/dseg_open.c
2
2
#include <unistd.h>
3
3
#include <fcntl.h>
4
4
#include <grass/segment.h>
5
 
#include "cseg.h"
 
5
#include "Gwater.h"
6
6
 
7
7
 
8
8
int dseg_open(DSEG * dseg, int srows, int scols, int nsegs_in_memory)
23
23
    }
24
24
    if (0 >
25
25
        (errflag =
26
 
         segment_format(fd, G_window_rows(), G_window_cols(), srows, scols,
 
26
         Segment_format(fd, Rast_window_rows(), Rast_window_cols(), srows, scols,
27
27
                        sizeof(double)))) {
28
28
        close(fd);
29
29
        unlink(filename);
42
42
        G_warning("dseg_open(): unable to re-open segment file");
43
43
        return -4;
44
44
    }
45
 
    if (0 > (errflag = segment_init(&(dseg->seg), fd, nsegs_in_memory))) {
 
45
    if (0 > (errflag = Segment_init(&(dseg->seg), fd, nsegs_in_memory))) {
46
46
        close(fd);
47
47
        unlink(filename);
48
48
        if (errflag == -1) {