[GRASS-SVN] r62335 - in grass/trunk: lib/python/docs/src lib/segment raster/r.stream.channel

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-10-22 00:35:04 -0700 (Wed, 22 Oct 2014)
New Revision: 62335

Modified:
   grass/trunk/lib/python/docs/src/pygrass_raster.rst
   grass/trunk/lib/segment/seek.c
   grass/trunk/lib/segment/setup.c
   grass/trunk/raster/r.stream.channel/stream_topology.c
Log:
libsegment: minor updates for r62324

Modified: grass/trunk/lib/python/docs/src/pygrass_raster.rst
===================================================================
--- grass/trunk/lib/python/docs/src/pygrass_raster.rst	2014-10-22 03:57:08 UTC (rev 62334)
+++ grass/trunk/lib/python/docs/src/pygrass_raster.rst	2014-10-22 07:35:04 UTC (rev 62335)
@@ -175,7 +175,7 @@
 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 @@
         >>> # 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

Modified: grass/trunk/lib/segment/seek.c
===================================================================
--- grass/trunk/lib/segment/seek.c	2014-10-22 03:57:08 UTC (rev 62334)
+++ grass/trunk/lib/segment/seek.c	2014-10-22 07:35:04 UTC (rev 62335)
@@ -41,7 +41,7 @@
 {
     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 @@
 {
     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;

Modified: grass/trunk/lib/segment/setup.c
===================================================================
--- grass/trunk/lib/segment/setup.c	2014-10-22 03:57:08 UTC (rev 62334)
+++ grass/trunk/lib/segment/setup.c	2014-10-22 07:35:04 UTC (rev 62335)
@@ -43,7 +43,7 @@
     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 @@
 	    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 @@
 	    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 @@
     /* 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;
     }

Modified: grass/trunk/raster/r.stream.channel/stream_topology.c
===================================================================
--- grass/trunk/raster/r.stream.channel/stream_topology.c	2014-10-22 03:57:08 UTC (rev 62334)
+++ grass/trunk/raster/r.stream.channel/stream_topology.c	2014-10-22 07:35:04 UTC (rev 62335)
@@ -284,7 +284,7 @@
 	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 {