[GRASS-SVN] r74441 - grass/trunk/raster/r.to.vect

[svn_grass at osgeo.org]

Author: mmetz
Date: 2019-04-30 11:14:24 -0700 (Tue, 30 Apr 2019)
New Revision: 74441

Modified:
   grass/trunk/raster/r.to.vect/areas_io.c
   grass/trunk/raster/r.to.vect/lines.c
   grass/trunk/raster/r.to.vect/lines_io.c
Log:
r.to.vect: reduce compiler warnings, fix typo

Modified: grass/trunk/raster/r.to.vect/areas_io.c
===================================================================
--- grass/trunk/raster/r.to.vect/areas_io.c	2019-04-30 13:02:51 UTC (rev 74440)
+++ grass/trunk/raster/r.to.vect/areas_io.c	2019-04-30 18:14:24 UTC (rev 74441)
@@ -152,9 +152,9 @@
 	/* this should NEVER happen */
 	if ((p = move(p)) == NULPTR)
 	    G_fatal_error(_("write_bnd:  line terminated unexpectedly\n"
-			    "previous (%d) point %p (%d,%d,%d) %p %p"),
-			  direction, last, last->row, last->col, last->node,
-			  last->fptr, last->bptr);
+			    "previous (%d) point %d (%d,%d,%d) %p %p"),
+			  direction, i, last->row, last->col, last->node,
+			  (void *)last->fptr, (void *)last->bptr);
 
 	y = cell_head.north - p->row * cell_head.ns_res;
 	x = cell_head.west + p->col * cell_head.ew_res;
@@ -203,9 +203,9 @@
 	last = p;
 	if ((p = move(p)) == NULPTR) {	/* this should NEVER happen */
 	    G_debug(3, "write_smooth_bnd:  line terminated unexpectedly\n");
-	    G_debug(3, "  previous (%d) point %p (%d,%d,%d) %p %p\n",
-		    direction, last, last->row, last->col, last->node,
-		    last->fptr, last->bptr);
+	    G_debug(3, "  previous (%d) point %d (%d,%d,%d) %p %p\n",
+		    direction, i, last->row, last->col, last->node,
+		    (void *)last->fptr, (void *)last->bptr);
 
 	    exit(EXIT_FAILURE);
 	}

Modified: grass/trunk/raster/r.to.vect/lines.c
===================================================================
--- grass/trunk/raster/r.to.vect/lines.c	2019-04-30 13:02:51 UTC (rev 74440)
+++ grass/trunk/raster/r.to.vect/lines.c	2019-04-30 18:14:24 UTC (rev 74441)
@@ -16,7 +16,7 @@
  *
  * Algorithm was modified by Olga Waupotitsch
  * USA CERL on nov, 1993
- * because the previous implementation was incosistent
+ * because the previous implementation was inconsistent
  * stopped in the middle of map, because it tried to continue
  * a line which was presumed to have been started earlier
  * but in fact was not started.

Modified: grass/trunk/raster/r.to.vect/lines_io.c
===================================================================
--- grass/trunk/raster/r.to.vect/lines_io.c	2019-04-30 13:02:51 UTC (rev 74440)
+++ grass/trunk/raster/r.to.vect/lines_io.c	2019-04-30 18:14:24 UTC (rev 74441)
@@ -175,9 +175,9 @@
 	/* this should NEVER happen */
 	if ((p = move(p)) == NULL)
 	    G_fatal_error(_("write_line: line terminated unexpectedly\n"
-			    "  previous (%d) point %p (%d,%d,%d) %p %p"),
-			  direction, last, last->row, last->col, last->node,
-			  last->fptr, last->bptr);
+			    "  previous (%d) point %d (%d,%d,%d) %p %p"),
+			  direction, i, last->row, last->col, last->node,
+			  (void *)last->fptr, (void *)last->bptr);
 
 	y = cell_head.north - ((double)p->row + 0.5) * cell_head.ns_res;
 	x = cell_head.west + ((double)p->col + 0.5) * cell_head.ew_res;