浏览代码

libsegment: minor updates for https://trac.osgeo.org/grass/changeset/62324

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62335 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 年之前
父节点
当前提交
9c6c145696
共有 4 个文件被更改,包括 9 次插入9 次删除
  1. 2 2
      lib/python/docs/src/pygrass_raster.rst
  2. 2 2
      lib/segment/seek.c
  3. 4 4
      lib/segment/setup.c
  4. 1 1
      raster/r.stream.channel/stream_topology.c

+ 2 - 2
lib/python/docs/src/pygrass_raster.rst

@@ -175,7 +175,7 @@ opening maps in a read-write mode. ::
 Due to the unique behavior of this class, the RasterSegment class defines two
 methods to read a map:
 
-    * ``get_row`` calls the C function ``segment_get_row`` and returns a buffer
+    * ``get_row`` calls the C function ``Segment_get_row`` and returns a buffer
       object with the row. ::
 
         >>> # call explicity the method
@@ -183,7 +183,7 @@ methods to read a map:
         >>> # call implicity the method
         >>> elev_row0 = elev[0]
 
-    * ``get`` calls the C function ``segment_get`` and returns the value of the
+    * ``get`` calls the C function ``Segment_get`` and returns the value of the
       map cell. ::
 
         >>> # call explicity the method

+ 2 - 2
lib/segment/seek.c

@@ -41,7 +41,7 @@ int Segment_seek_fast(const SEGMENT * SEG, int n, int index)
 {
     if (lseek((SEG)->fd, SEG_SEEK_FAST(SEG, n, index), 
         SEEK_SET) == (off_t) -1) {
-	G_fatal_error("segment_seek: %s", strerror(errno));
+	G_fatal_error("Segment_seek: %s", strerror(errno));
     }
 
     return 0;
@@ -51,7 +51,7 @@ int Segment_seek_slow(const SEGMENT * SEG, int n, int index)
 {
     if (lseek((SEG)->fd, SEG_SEEK_SLOW(SEG, n, index), 
         SEEK_SET) == (off_t) -1) {
-	G_fatal_error("segment_seek: %s", strerror(errno));
+	G_fatal_error("Segment_seek: %s", strerror(errno));
     }
 
     return 0;

+ 4 - 4
lib/segment/setup.c

@@ -43,7 +43,7 @@ int Segment_setup(SEGMENT * SEG)
     if (SEG->nrows <= 0 || SEG->ncols <= 0
 	|| SEG->srows <= 0 || SEG->scols <= 0
 	|| SEG->len <= 0 || SEG->nseg <= 0) {
-	G_warning("segment_setup: illegal segment file parameters");
+	G_warning("Segment_setup: illegal segment file parameters");
 	return -1;
     }
 
@@ -71,7 +71,7 @@ int Segment_setup(SEGMENT * SEG)
 	    SEG->srowbits = seg_exp;
 	    SEG->segbits = SEG->srowbits + SEG->scolbits;
 	    SEG->fast_adrs = 1;
-	    G_debug(1, "segment_setup: fast address activated");
+	    G_debug(1, "Segment_setup: fast address activated");
 	}
     }
     if (SEG->fast_adrs)
@@ -89,7 +89,7 @@ int Segment_setup(SEGMENT * SEG)
 	    SEG->lenbits = seg_exp;
 	    SEG->sizebits = SEG->segbits + SEG->lenbits;
 	    SEG->fast_seek = 1;
-	    G_debug(1, "segment_setup: fast seek activated");
+	    G_debug(1, "Segment_setup: fast seek activated");
 	}
     }
     if (SEG->fast_seek)
@@ -100,7 +100,7 @@ int Segment_setup(SEGMENT * SEG)
     /* adjust number of open segments if larger than number of total segments */
     n_total_segs = SEG->spr * ((SEG->nrows + SEG->srows - 1) / SEG->srows);
     if (SEG->nseg > n_total_segs) {
-	G_debug(1, "segment_setup: reducing number of open segments from %d to %d",
+	G_debug(1, "Segment_setup: reducing number of open segments from %d to %d",
 		  SEG->nseg, n_total_segs);
 	SEG->nseg = n_total_segs;
     }

+ 1 - 1
raster/r.stream.channel/stream_topology.c

@@ -284,7 +284,7 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	r = SA[i].init_r;
 	c = SA[i].init_c;
 	Segment_get(streams, &(SA[i].order), r, c);
-	//segment_get(streams,&streams_cell,r,c);
+	/* Segment_get(streams,&streams_cell,r,c); */
 	SA[i].number_of_cells = 0;
 
 	do {