[GRASS-SVN] r45432 - in grass/branches/develbranch_6: include lib/g3d

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-02-18 07:20:12 -0800 (Fri, 18 Feb 2011)
New Revision: 45432

Modified:
   grass/branches/develbranch_6/include/proto_dbmi.h
   grass/branches/develbranch_6/lib/g3d/g3dmask.c
Log:
fix r45430 - define db_free() and revert changes in lib/g3d/g3dmask.c


Modified: grass/branches/develbranch_6/include/proto_dbmi.h
===================================================================
--- grass/branches/develbranch_6/include/proto_dbmi.h	2011-02-18 15:11:11 UTC (rev 45431)
+++ grass/branches/develbranch_6/include/proto_dbmi.h	2011-02-18 15:20:12 UTC (rev 45432)
@@ -129,6 +129,7 @@
 int db_fetch(dbCursor * cursor, int position, int *more);
 int db_find_database(dbDriver * driver, dbHandle * handle, int *found);
 dbAddress db_find_token(dbToken token);
+void *db_free(void *s);
 void db_free_column(dbColumn * column);
 void db_free_cursor(dbCursor * cursor);
 void db_free_cursor_column_flags(dbCursor * cursor);

Modified: grass/branches/develbranch_6/lib/g3d/g3dmask.c
===================================================================
--- grass/branches/develbranch_6/lib/g3d/g3dmask.c	2011-02-18 15:11:11 UTC (rev 45431)
+++ grass/branches/develbranch_6/lib/g3d/g3dmask.c	2011-02-18 15:20:12 UTC (rev 45432)
@@ -309,12 +309,12 @@
 	for (dy = y; dy < rows; dy++) {
 	    for (dx = x; dx < cols; dx++) {
 		G3D_MASKNUM(map, dx, dy, dz, tile, type);
-		(unsigned char *)tile += length;
+		tile += length;
 	    }
 
-	    (unsigned char *)tile += xLength;
+	    tile += xLength;
 	}
-	(unsigned char *)tile += yLength;
+	tile += yLength;
     }
 }