← 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/sseg_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/sseg_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
int
8
 
seg_open(SSEG * sseg, int nrows, int ncols, int row_in_seg, int col_in_seg,
 
8
seg_open(SSEG * sseg, GW_LARGE_INT nrows, GW_LARGE_INT ncols, int row_in_seg, int col_in_seg,
9
9
         int nsegs_in_memory, int size_struct)
10
10
{
11
11
    char *filename;
20
20
        G_warning("seg_open(): unable to create segment file");
21
21
        return -2;
22
22
    }
23
 
    if (0 > (errflag = segment_format(fd, nrows, ncols,
 
23
    if (0 > (errflag = Segment_format(fd, nrows, ncols,
24
24
                                      row_in_seg, col_in_seg, size_struct))) {
25
25
        close(fd);
26
26
        unlink(filename);
39
39
        G_warning("seg_open(): unable to re-open segment file");
40
40
        return -4;
41
41
    }
42
 
    if (0 > (errflag = segment_init(&(sseg->seg), fd, nsegs_in_memory))) {
 
42
    if (0 > (errflag = Segment_init(&(sseg->seg), fd, nsegs_in_memory))) {
43
43
        close(fd);
44
44
        unlink(filename);
45
45
        if (errflag == -1) {