[GRASS-SVN] r47535 - grass/trunk/lib/raster3d
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 10 13:05:12 EDT 2011
Author: martinl
Date: 2011-08-10 10:05:11 -0700 (Wed, 10 Aug 2011)
New Revision: 47535
Added:
grass/trunk/lib/raster3d/raster3d_intern.h
Removed:
grass/trunk/lib/raster3d/G3d_intern.h
Modified:
grass/trunk/lib/raster3d/alloc.c
grass/trunk/lib/raster3d/cache.c
grass/trunk/lib/raster3d/cache1.c
grass/trunk/lib/raster3d/cachehash.c
grass/trunk/lib/raster3d/cats.c
grass/trunk/lib/raster3d/close.c
grass/trunk/lib/raster3d/color.c
grass/trunk/lib/raster3d/defaults.c
grass/trunk/lib/raster3d/doubleio.c
grass/trunk/lib/raster3d/error.c
grass/trunk/lib/raster3d/filename.c
grass/trunk/lib/raster3d/fpcompress.c
grass/trunk/lib/raster3d/fpxdr.c
grass/trunk/lib/raster3d/getblock.c
grass/trunk/lib/raster3d/getvalue.c
grass/trunk/lib/raster3d/header.c
grass/trunk/lib/raster3d/headerinfo.c
grass/trunk/lib/raster3d/history.c
grass/trunk/lib/raster3d/index.c
grass/trunk/lib/raster3d/intio.c
grass/trunk/lib/raster3d/keys.c
grass/trunk/lib/raster3d/long.c
grass/trunk/lib/raster3d/mapset.c
grass/trunk/lib/raster3d/mask.c
grass/trunk/lib/raster3d/misc.c
grass/trunk/lib/raster3d/null.c
grass/trunk/lib/raster3d/open.c
grass/trunk/lib/raster3d/param.c
grass/trunk/lib/raster3d/putvalue.c
grass/trunk/lib/raster3d/range.c
grass/trunk/lib/raster3d/region.c
grass/trunk/lib/raster3d/resample.c
grass/trunk/lib/raster3d/tilealloc.c
grass/trunk/lib/raster3d/tileio.c
grass/trunk/lib/raster3d/tilemath.c
grass/trunk/lib/raster3d/tilenull.c
grass/trunk/lib/raster3d/tileread.c
grass/trunk/lib/raster3d/tilewrite.c
grass/trunk/lib/raster3d/window.c
grass/trunk/lib/raster3d/windowio.c
Log:
G3d_intern.h -> raster3d_intern.h
Deleted: grass/trunk/lib/raster3d/G3d_intern.h
===================================================================
--- grass/trunk/lib/raster3d/G3d_intern.h 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/G3d_intern.h 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,84 +0,0 @@
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-/*---------------------------------------------------------------------------*/
-
-#include <grass/raster3d.h>
-#include <grass/gis.h>
-
-/*---------------------------------------------------------------------------*/
-
-#define G3D_LONG_LENGTH sizeof (long)
-
-#define G3D_XDR_INT_LENGTH 4
-#define G3D_XDR_DOUBLE_LENGTH 8
-#define G3D_XDR_FLOAT_LENGTH 4
-
-#define G3D_IS_CORRECT_TYPE(t) (((t) == FCELL_TYPE) || ((t) == DCELL_TYPE))
-
-#define G3D_WRITE_DATA 1
-#define G3D_READ_DATA 0
-
-#define G3D_VALID_OPERATION(o) \
- (((o) == G3D_WRITE_DATA) || ((o) == G3D_READ_DATA))
-
-#define G3D_MIN(a,b) ((a) <= (b) ? (a) : (b))
-#define G3D_MAX(a,b) ((a) >= (b) ? (a) : (b))
-
-#define G3D_HAS_INDEX 1
-#define G3D_NO_INDEX 0
-
-#define G3D_USE_XDR 1
-#define G3D_NO_XDR 0
-
-#define G3D_VALID_XDR_OPTION(o) (((o) == G3D_USE_XDR) || ((o) == G3D_NO_XDR))
-
-/*---------------------------------------------------------------------------*/
-
-/* global arrays */
-
-extern void *tmpCompress; /* compression support array */
-extern int tmpCompressLength; /* in bytes */
-extern void *xdr; /* xdr support array */
-extern int xdrLength; /* in bytes */
-
-/*---------------------------------------------------------------------------*/
-
-/* global variables */
-
-extern int g3d_do_compression; /* G3D_NO_COMPRESSION or G3D_COMPRESSION */
-extern int g3d_do_lzw_compression; /* G3D_USE_LZW or G3D_NO_LZW */
-extern int g3d_do_rle_compression; /* G3D_USE_RLE or G3D_NO_RLE */
-extern int g3d_precision; /* G3D_ALLOW_PRECISION or G3D_NO_PRECISION */
-extern int g3d_cache_default; /* in number of tiles; 0 ==> no cache */
-extern int g3d_cache_max; /* in bytes */
-extern int g3d_file_type; /* FCELL_TYPE or DCELL_TYPE */
-extern int g3d_tile_dimension[3];
-extern void (*g3d_error_fun) (const char *);
-extern char *g3d_unit_default;
-
-extern G3D_Region g3d_window;
-
-/*---------------------------------------------------------------------------*/
-
-extern void G3d_fatalError(const char * /* msg */ , ...);
-extern void G3d_fatalError_noargs(const char * /* msg */ );
-
-/*---------------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------------*/
-
-#define G3D_REGION_NORTH "North"
-#define G3D_REGION_SOUTH "South"
-#define G3D_REGION_EAST "East"
-#define G3D_REGION_WEST "West"
-#define G3D_REGION_TOP "Top"
-#define G3D_REGION_BOTTOM "Bottom"
-#define G3D_REGION_ROWS "nofRows"
-#define G3D_REGION_COLS "nofCols"
-#define G3D_REGION_DEPTHS "nofDepths"
-#define G3D_REGION_PROJ "Proj"
-#define G3D_REGION_ZONE "Zone"
-#define G3D_REGION_EWRES "e-w resol"
-#define G3D_REGION_NSRES "n-s resol"
-#define G3D_REGION_TBRES "t-b resol"
Modified: grass/trunk/lib/raster3d/alloc.c
===================================================================
--- grass/trunk/lib/raster3d/alloc.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/alloc.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/cache.c
===================================================================
--- grass/trunk/lib/raster3d/cache.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/cache.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -3,7 +3,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/cache1.c
===================================================================
--- grass/trunk/lib/raster3d/cache1.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/cache1.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
#include "cachehash.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/cachehash.c
===================================================================
--- grass/trunk/lib/raster3d/cachehash.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/cachehash.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
#ifndef GRASS_RASTER3D_H
Modified: grass/trunk/lib/raster3d/cats.c
===================================================================
--- grass/trunk/lib/raster3d/cats.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/cats.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -8,7 +8,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/close.c
===================================================================
--- grass/trunk/lib/raster3d/close.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/close.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -8,7 +8,7 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/color.c
===================================================================
--- grass/trunk/lib/raster3d/color.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/color.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -11,7 +11,7 @@
#include <grass/raster.h>
#include <grass/glocale.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
static int read_colors(const char *, const char *, struct Colors *);
static int read_new_colors(FILE *, struct Colors *);
Modified: grass/trunk/lib/raster3d/defaults.c
===================================================================
--- grass/trunk/lib/raster3d/defaults.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/defaults.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/doubleio.c
===================================================================
--- grass/trunk/lib/raster3d/doubleio.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/doubleio.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/error.c
===================================================================
--- grass/trunk/lib/raster3d/error.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/error.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -8,7 +8,7 @@
#include <rpc/xdr.h>
#include <grass/gis.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/filename.c
===================================================================
--- grass/trunk/lib/raster3d/filename.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/filename.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/fpcompress.c
===================================================================
--- grass/trunk/lib/raster3d/fpcompress.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/fpcompress.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/fpxdr.c
===================================================================
--- grass/trunk/lib/raster3d/fpxdr.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/fpxdr.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -8,7 +8,7 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/getblock.c
===================================================================
--- grass/trunk/lib/raster3d/getblock.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/getblock.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/getvalue.c
===================================================================
--- grass/trunk/lib/raster3d/getvalue.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/getvalue.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,5 +1,5 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/header.c
===================================================================
--- grass/trunk/lib/raster3d/header.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/header.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -5,7 +5,7 @@
#include <rpc/types.h>
#include <rpc/xdr.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/headerinfo.c
===================================================================
--- grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,5 +1,5 @@
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/history.c
===================================================================
--- grass/trunk/lib/raster3d/history.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/history.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <grass/glocale.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
#include <grass/raster.h>
/*simple error message */
Modified: grass/trunk/lib/raster3d/index.c
===================================================================
--- grass/trunk/lib/raster3d/index.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/index.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/intio.c
===================================================================
--- grass/trunk/lib/raster3d/intio.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/intio.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/keys.c
===================================================================
--- grass/trunk/lib/raster3d/keys.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/keys.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/long.c
===================================================================
--- grass/trunk/lib/raster3d/long.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/long.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,4 +1,4 @@
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/mapset.c
===================================================================
--- grass/trunk/lib/raster3d/mapset.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/mapset.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/mask.c
===================================================================
--- grass/trunk/lib/raster3d/mask.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/mask.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <grass/gis.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/misc.c
===================================================================
--- grass/trunk/lib/raster3d/misc.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/misc.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -8,7 +8,7 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/null.c
===================================================================
--- grass/trunk/lib/raster3d/null.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/null.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -5,7 +5,7 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/open.c
===================================================================
--- grass/trunk/lib/raster3d/open.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/open.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -5,7 +5,7 @@
#include <unistd.h>
#include <grass/raster3d.h>
#include <grass/glocale.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/param.c
===================================================================
--- grass/trunk/lib/raster3d/param.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/param.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,7 +1,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/glocale.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*----------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/putvalue.c
===================================================================
--- grass/trunk/lib/raster3d/putvalue.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/putvalue.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,5 +1,5 @@
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*!
Modified: grass/trunk/lib/raster3d/range.c
===================================================================
--- grass/trunk/lib/raster3d/range.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/range.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -9,7 +9,7 @@
#include <grass/raster.h>
#include <grass/glocale.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Copied: grass/trunk/lib/raster3d/raster3d_intern.h (from rev 47534, grass/trunk/lib/raster3d/G3d_intern.h)
===================================================================
--- grass/trunk/lib/raster3d/raster3d_intern.h (rev 0)
+++ grass/trunk/lib/raster3d/raster3d_intern.h 2011-08-10 17:05:11 UTC (rev 47535)
@@ -0,0 +1,84 @@
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
+/*---------------------------------------------------------------------------*/
+
+#include <grass/raster3d.h>
+#include <grass/gis.h>
+
+/*---------------------------------------------------------------------------*/
+
+#define G3D_LONG_LENGTH sizeof (long)
+
+#define G3D_XDR_INT_LENGTH 4
+#define G3D_XDR_DOUBLE_LENGTH 8
+#define G3D_XDR_FLOAT_LENGTH 4
+
+#define G3D_IS_CORRECT_TYPE(t) (((t) == FCELL_TYPE) || ((t) == DCELL_TYPE))
+
+#define G3D_WRITE_DATA 1
+#define G3D_READ_DATA 0
+
+#define G3D_VALID_OPERATION(o) \
+ (((o) == G3D_WRITE_DATA) || ((o) == G3D_READ_DATA))
+
+#define G3D_MIN(a,b) ((a) <= (b) ? (a) : (b))
+#define G3D_MAX(a,b) ((a) >= (b) ? (a) : (b))
+
+#define G3D_HAS_INDEX 1
+#define G3D_NO_INDEX 0
+
+#define G3D_USE_XDR 1
+#define G3D_NO_XDR 0
+
+#define G3D_VALID_XDR_OPTION(o) (((o) == G3D_USE_XDR) || ((o) == G3D_NO_XDR))
+
+/*---------------------------------------------------------------------------*/
+
+/* global arrays */
+
+extern void *tmpCompress; /* compression support array */
+extern int tmpCompressLength; /* in bytes */
+extern void *xdr; /* xdr support array */
+extern int xdrLength; /* in bytes */
+
+/*---------------------------------------------------------------------------*/
+
+/* global variables */
+
+extern int g3d_do_compression; /* G3D_NO_COMPRESSION or G3D_COMPRESSION */
+extern int g3d_do_lzw_compression; /* G3D_USE_LZW or G3D_NO_LZW */
+extern int g3d_do_rle_compression; /* G3D_USE_RLE or G3D_NO_RLE */
+extern int g3d_precision; /* G3D_ALLOW_PRECISION or G3D_NO_PRECISION */
+extern int g3d_cache_default; /* in number of tiles; 0 ==> no cache */
+extern int g3d_cache_max; /* in bytes */
+extern int g3d_file_type; /* FCELL_TYPE or DCELL_TYPE */
+extern int g3d_tile_dimension[3];
+extern void (*g3d_error_fun) (const char *);
+extern char *g3d_unit_default;
+
+extern G3D_Region g3d_window;
+
+/*---------------------------------------------------------------------------*/
+
+extern void G3d_fatalError(const char * /* msg */ , ...);
+extern void G3d_fatalError_noargs(const char * /* msg */ );
+
+/*---------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------*/
+
+#define G3D_REGION_NORTH "North"
+#define G3D_REGION_SOUTH "South"
+#define G3D_REGION_EAST "East"
+#define G3D_REGION_WEST "West"
+#define G3D_REGION_TOP "Top"
+#define G3D_REGION_BOTTOM "Bottom"
+#define G3D_REGION_ROWS "nofRows"
+#define G3D_REGION_COLS "nofCols"
+#define G3D_REGION_DEPTHS "nofDepths"
+#define G3D_REGION_PROJ "Proj"
+#define G3D_REGION_ZONE "Zone"
+#define G3D_REGION_EWRES "e-w resol"
+#define G3D_REGION_NSRES "n-s resol"
+#define G3D_REGION_TBRES "t-b resol"
Modified: grass/trunk/lib/raster3d/region.c
===================================================================
--- grass/trunk/lib/raster3d/region.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/region.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <grass/raster.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/resample.c
===================================================================
--- grass/trunk/lib/raster3d/resample.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/resample.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <grass/gis.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/tilealloc.c
===================================================================
--- grass/trunk/lib/raster3d/tilealloc.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tilealloc.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/tileio.c
===================================================================
--- grass/trunk/lib/raster3d/tileio.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tileio.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/tilemath.c
===================================================================
--- grass/trunk/lib/raster3d/tilemath.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tilemath.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/tilenull.c
===================================================================
--- grass/trunk/lib/raster3d/tilenull.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tilenull.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/tileread.c
===================================================================
--- grass/trunk/lib/raster3d/tileread.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tileread.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -6,7 +6,7 @@
#include <rpc/xdr.h>
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
static int
G3d_xdrTile2tile(G3D_Map * map, void *tile, int rows, int cols, int depths,
Modified: grass/trunk/lib/raster3d/tilewrite.c
===================================================================
--- grass/trunk/lib/raster3d/tilewrite.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/tilewrite.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -6,7 +6,7 @@
#include <rpc/xdr.h>
#include <grass/raster.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/window.c
===================================================================
--- grass/trunk/lib/raster3d/window.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/window.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <grass/gis.h>
#include <grass/raster3d.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/windowio.c
===================================================================
--- grass/trunk/lib/raster3d/windowio.c 2011-08-10 16:59:42 UTC (rev 47534)
+++ grass/trunk/lib/raster3d/windowio.c 2011-08-10 17:05:11 UTC (rev 47535)
@@ -5,7 +5,7 @@
#include <unistd.h>
#include <string.h>
#include <grass/gis.h>
-#include "G3d_intern.h"
+#include "raster3d_intern.h"
/*---------------------------------------------------------------------------*/
More information about the grass-commit
mailing list