[GRASS-SVN] r58787 - in grass/branches/develbranch_6: include lib/ogsf

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-01-27 00:39:57 -0800 (Mon, 27 Jan 2014)
New Revision: 58787

Modified:
   grass/branches/develbranch_6/include/ogsf_proto.h
   grass/branches/develbranch_6/lib/ogsf/gs.c
   grass/branches/develbranch_6/lib/ogsf/gsds.c
Log:
allow m.nviz.image (and maybe the rest of the nviz family) to work with 64bit region sizes (merge from trunk)

Modified: grass/branches/develbranch_6/include/ogsf_proto.h
===================================================================
--- grass/branches/develbranch_6/include/ogsf_proto.h	2014-01-27 07:38:57 UTC (rev 58786)
+++ grass/branches/develbranch_6/include/ogsf_proto.h	2014-01-27 08:39:57 UTC (rev 58787)
@@ -404,7 +404,7 @@
 int gs_get_att_type(geosurf *, int);
 int gs_get_att_src(geosurf *, int);
 typbuff *gs_get_att_typbuff(geosurf *, int, int);
-int gs_malloc_att_buff(geosurf *, int, int);
+size_t gs_malloc_att_buff(geosurf *, int, int);
 int gs_malloc_lookup(geosurf *, int);
 int gs_set_att_type(geosurf *, int, int);
 int gs_set_att_src(geosurf *, int, int);

Modified: grass/branches/develbranch_6/lib/ogsf/gs.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gs.c	2014-01-27 07:38:57 UTC (rev 58786)
+++ grass/branches/develbranch_6/lib/ogsf/gs.c	2014-01-27 08:39:57 UTC (rev 58787)
@@ -714,7 +714,7 @@
    \return -1 on error
    \return pointer to typbuff (casted)
  */
-int gs_malloc_att_buff(geosurf * gs, int desc, int type)
+size_t gs_malloc_att_buff(geosurf * gs, int desc, int type)
 {
     int hdata, dims[2], ndims;
 

Modified: grass/branches/develbranch_6/lib/ogsf/gsds.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsds.c	2014-01-27 07:38:57 UTC (rev 58786)
+++ grass/branches/develbranch_6/lib/ogsf/gsds.c	2014-01-27 08:39:57 UTC (rev 58787)
@@ -481,7 +481,8 @@
 int gsds_alloc_typbuff(int id, int *dims, int ndims, int type)
 {
     dataset *ds;
-    int i, siz = 1;
+    int i;
+    size_t siz = 1;
 
     if ((ds = get_dataset(id))) {
 	/*