[GRASS-SVN] r51481 - in grass/trunk/include: . defs

[svn_grass at osgeo.org]

Author: mmetz
Date: 2012-04-22 10:11:04 -0700 (Sun, 22 Apr 2012)
New Revision: 51481

Modified:
   grass/trunk/include/defs/segment.h
   grass/trunk/include/segment.h
Log:
segment lib: support for more than 2 billion cells (header)

Modified: grass/trunk/include/defs/segment.h
===================================================================
--- grass/trunk/include/defs/segment.h	2012-04-22 16:04:44 UTC (rev 51480)
+++ grass/trunk/include/defs/segment.h	2012-04-22 17:11:04 UTC (rev 51481)
@@ -1,19 +1,19 @@
 #ifndef GRASS_SEGMENTDEFS_H
 #define GRASS_SEGMENTDEFS_H
 
-int segment_address(const SEGMENT *, int, int, int *, int *);
-int segment_address_fast(const SEGMENT *, int, int, int *, int *);
-int segment_address_slow(const SEGMENT *, int, int, int *, int *);
+int segment_address(const SEGMENT *, off_t, off_t, int *, int *);
+int segment_address_fast(const SEGMENT *, off_t, off_t, int *, int *);
+int segment_address_slow(const SEGMENT *, off_t, off_t, int *, int *);
 int segment_flush(SEGMENT *);
-int segment_format(int, int, int, int, int, int);
-int segment_format_nofill(int, int, int, int, int, int);
-int segment_get(SEGMENT *, void *, int, int);
-int segment_get_row(const SEGMENT *, void *, int);
+int segment_format(int, off_t, off_t, int, int, int);
+int segment_format_nofill(int, off_t, off_t, int, int, int);
+int segment_get(SEGMENT *, void *, off_t, off_t);
+int segment_get_row(const SEGMENT *, void *, off_t);
 int segment_init(SEGMENT *, int, int);
 int segment_pagein(SEGMENT *, int);
 int segment_pageout(SEGMENT *, int);
-int segment_put(SEGMENT *, const void *, int, int);
-int segment_put_row(const SEGMENT *, const void *, int);
+int segment_put(SEGMENT *, const void *, off_t, off_t);
+int segment_put_row(const SEGMENT *, const void *, off_t);
 int segment_release(SEGMENT *);
 int segment_seek(const SEGMENT *, int, int);
 int segment_seek_fast(const SEGMENT *, int, int);

Modified: grass/trunk/include/segment.h
===================================================================
--- grass/trunk/include/segment.h	2012-04-22 16:04:44 UTC (rev 51480)
+++ grass/trunk/include/segment.h	2012-04-22 17:11:04 UTC (rev 51481)
@@ -19,8 +19,8 @@
 typedef struct
 {
     int open;			/* open flag */
-    int nrows;			/* rows in original data */
-    int ncols;			/* cols in original data */
+    off_t nrows;		/* rows in original data */
+    off_t ncols;		/* cols in original data */
     int len;			/* bytes per data value */
     int srows;			/* rows in segments */
     int scols;			/* cols in segments */
@@ -30,11 +30,11 @@
     int spill;			/* cols in last segment in row */
 
     /* fast mode */
-    int slow_adrs;      	/* toggles fast address mode */
-    int scolbits;       	/* column bitshift */
-    int srowbits;       	/* row bitshift */
-    int segbits;        	/* segment bitshift */
-    int slow_seek;      	/* toggles fast seek mode */
+    int fast_adrs;      	/* toggles fast address mode */
+    off_t scolbits;       	/* column bitshift */
+    off_t srowbits;       	/* row bitshift */
+    off_t segbits;        	/* segment bitshift */
+    int fast_seek;      	/* toggles fast seek mode */
     int lenbits;        	/* data size bitshift */
     int sizebits;       	/* segment size bitshift */
     int (*segment_address)();