[GRASS-SVN] r47537 - in grass/trunk: general/g.region include
lib/gpde lib/gpde/test lib/ogsf lib/raster3d
lib/raster3d/test locale/po raster/r.colors
raster/r.colors.out raster/r.mapcalc raster/r.to.rast3
raster/r.to.rast3elev raster/r.univar raster3d/r3.cross.rast
raster3d/r3.gwflow raster3d/r3.in.ascii raster3d/r3.in.v5d
raster3d/r3.info raster3d/r3.mask raster3d/r3.mkdspf
raster3d/r3.null raster3d/r3.out.ascii raster3d/r3.out.v5d
raster3d/r3.out.vtk raster3d/r3.retile raster3d/r3.showdspf
raster3d/r3.stats raster3d/r3.to.rast vector/v.to.rast3
vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 10 13:27:10 EDT 2011
Author: martinl
Date: 2011-08-10 10:27:10 -0700 (Wed, 10 Aug 2011)
New Revision: 47537
Modified:
grass/trunk/general/g.region/main.c
grass/trunk/include/raster3d.h
grass/trunk/include/raster3ddefs.h
grass/trunk/lib/gpde/N_arrays.c
grass/trunk/lib/gpde/N_arrays_calc.c
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/gpde/N_geom.c
grass/trunk/lib/gpde/test/test_arrays.c
grass/trunk/lib/gpde/test/test_geom.c
grass/trunk/lib/ogsf/GVL2.c
grass/trunk/lib/ogsf/Gvl3.c
grass/trunk/lib/ogsf/gvl_file.c
grass/trunk/lib/raster3d/G3d.h_unused
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/cachehash.h
grass/trunk/lib/raster3d/cats.c
grass/trunk/lib/raster3d/changeprecision.c
grass/trunk/lib/raster3d/changetype.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/filecompare.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/lib.dox
grass/trunk/lib/raster3d/long.c
grass/trunk/lib/raster3d/mapset.c
grass/trunk/lib/raster3d/mask.c
grass/trunk/lib/raster3d/maskfn.c
grass/trunk/lib/raster3d/misc.c
grass/trunk/lib/raster3d/null.c
grass/trunk/lib/raster3d/open.c
grass/trunk/lib/raster3d/open2.c
grass/trunk/lib/raster3d/param.c
grass/trunk/lib/raster3d/putvalue.c
grass/trunk/lib/raster3d/range.c
grass/trunk/lib/raster3d/raster3d_intern.h
grass/trunk/lib/raster3d/region.c
grass/trunk/lib/raster3d/resample.c
grass/trunk/lib/raster3d/retile.c
grass/trunk/lib/raster3d/rle.c
grass/trunk/lib/raster3d/test/test_coordinate_transform.c
grass/trunk/lib/raster3d/test/test_main.c
grass/trunk/lib/raster3d/test/test_put_get_value.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/volume.c
grass/trunk/lib/raster3d/window.c
grass/trunk/lib/raster3d/windowio.c
grass/trunk/lib/raster3d/writeascii.c
grass/trunk/locale/po/grasslibs_ar.po
grass/trunk/locale/po/grasslibs_cs.po
grass/trunk/locale/po/grasslibs_de.po
grass/trunk/locale/po/grasslibs_el.po
grass/trunk/locale/po/grasslibs_es.po
grass/trunk/locale/po/grasslibs_fr.po
grass/trunk/locale/po/grasslibs_hi.po
grass/trunk/locale/po/grasslibs_it.po
grass/trunk/locale/po/grasslibs_ja.po
grass/trunk/locale/po/grasslibs_ko.po
grass/trunk/locale/po/grasslibs_lv.po
grass/trunk/locale/po/grasslibs_ml.po
grass/trunk/locale/po/grasslibs_mr.po
grass/trunk/locale/po/grasslibs_pl.po
grass/trunk/locale/po/grasslibs_pt.po
grass/trunk/locale/po/grasslibs_pt_br.po
grass/trunk/locale/po/grasslibs_ru.po
grass/trunk/locale/po/grasslibs_sl.po
grass/trunk/locale/po/grasslibs_th.po
grass/trunk/locale/po/grasslibs_tr.po
grass/trunk/locale/po/grasslibs_vi.po
grass/trunk/locale/po/grasslibs_zh.po
grass/trunk/locale/po/grassmods_ar.po
grass/trunk/locale/po/grassmods_cs.po
grass/trunk/locale/po/grassmods_de.po
grass/trunk/locale/po/grassmods_el.po
grass/trunk/locale/po/grassmods_es.po
grass/trunk/locale/po/grassmods_fr.po
grass/trunk/locale/po/grassmods_hi.po
grass/trunk/locale/po/grassmods_it.po
grass/trunk/locale/po/grassmods_ja.po
grass/trunk/locale/po/grassmods_ko.po
grass/trunk/locale/po/grassmods_lv.po
grass/trunk/locale/po/grassmods_mr.po
grass/trunk/locale/po/grassmods_pl.po
grass/trunk/locale/po/grassmods_pt.po
grass/trunk/locale/po/grassmods_pt_br.po
grass/trunk/locale/po/grassmods_ru.po
grass/trunk/locale/po/grassmods_sl.po
grass/trunk/locale/po/grassmods_th.po
grass/trunk/locale/po/grassmods_tr.po
grass/trunk/locale/po/grassmods_vi.po
grass/trunk/locale/po/grassmods_zh.po
grass/trunk/raster/r.colors.out/raster3d_main.c
grass/trunk/raster/r.colors/edit_colors.c
grass/trunk/raster/r.colors/stats.c
grass/trunk/raster/r.mapcalc/map3.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.univar/r3.univar_main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.gwflow/main.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/raster3d/r3.in.v5d/main.c
grass/trunk/raster3d/r3.info/r3.info.main.c
grass/trunk/raster3d/r3.mask/main.c
grass/trunk/raster3d/r3.mkdspf/main.c
grass/trunk/raster3d/r3.mkdspf/r3_data.c
grass/trunk/raster3d/r3.null/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/r3.out.v5d/BUG
grass/trunk/raster3d/r3.out.v5d/main.c
grass/trunk/raster3d/r3.out.vtk/errorHandling.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
grass/trunk/raster3d/r3.retile/main.c
grass/trunk/raster3d/r3.showdspf/main_ogl.c
grass/trunk/raster3d/r3.showdspf/r3_data.c
grass/trunk/raster3d/r3.stats/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/vector/v.to.rast3/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/user1.c
Log:
G3d_ -> Rast3d_
Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/general/g.region/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -488,11 +488,11 @@
if ((mapset = G_find_grid3(name, "")) == NULL)
G_fatal_error(_("3D raster map <%s> not found"), name);
- if (G3d_readRegionMap(name, mapset, &win) < 0)
+ if (Rast3d_readRegionMap(name, mapset, &win) < 0)
G_fatal_error(_("Unable to read header of 3D raster map <%s@%s>"),
name, mapset);
- G3d_regionToCellHead(&win, &window);
+ Rast3d_regionToCellHead(&win, &window);
}
/* vect= */
Modified: grass/trunk/include/raster3d.h
===================================================================
--- grass/trunk/include/raster3d.h 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/include/raster3d.h 2011-08-10 17:27:10 UTC (rev 47537)
@@ -231,7 +231,7 @@
int lastIndex;
int lastIndexActive;
-} G3d_cache_hash;
+} Rast3d_cache_hash;
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/include/raster3ddefs.h
===================================================================
--- grass/trunk/include/raster3ddefs.h 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/include/raster3ddefs.h 2011-08-10 17:27:10 UTC (rev 47537)
@@ -2,48 +2,48 @@
#define GRASS_RASTER3DDEFS_H
/* cache.c */
-void G3d_cache_reset(RASTER3D_cache *);
-void G3d_cache_dispose(RASTER3D_cache *);
-void *G3d_cache_new(int, int, int, write_fn *, void *, read_fn *, void *);
-void G3d_cache_set_removeFun(RASTER3D_cache *, write_fn *, void *);
-void G3d_cache_set_loadFun(RASTER3D_cache *, read_fn *, void *);
-void *G3d_cache_new_read(int, int, int, read_fn *, void *);
-int G3d_cache_lock(RASTER3D_cache *, int);
-void G3d_cache_lock_intern(RASTER3D_cache *, int);
-int G3d_cache_unlock(RASTER3D_cache *, int);
-int G3d_cache_unlock_all(RASTER3D_cache *);
-int G3d_cache_lock_all(RASTER3D_cache *);
-void G3d_cache_autolock_on(RASTER3D_cache *);
-void G3d_cache_autolock_off(RASTER3D_cache *);
-void G3d_cache_set_minUnlock(RASTER3D_cache *, int);
-int G3d_cache_remove_elt(RASTER3D_cache *, int);
-int G3d_cache_flush(RASTER3D_cache *, int);
-int G3d_cache_remove_all(RASTER3D_cache *);
-int G3d_cache_flush_all(RASTER3D_cache *);
-void *G3d_cache_elt_ptr(RASTER3D_cache *, int);
-int G3d_cache_load(RASTER3D_cache *, int);
-int G3d_cache_get_elt(RASTER3D_cache *, int, void *);
-int G3d_cache_put_elt(RASTER3D_cache *, int, const void *);
+void Rast3d_cache_reset(RASTER3D_cache *);
+void Rast3d_cache_dispose(RASTER3D_cache *);
+void *Rast3d_cache_new(int, int, int, write_fn *, void *, read_fn *, void *);
+void Rast3d_cache_set_removeFun(RASTER3D_cache *, write_fn *, void *);
+void Rast3d_cache_set_loadFun(RASTER3D_cache *, read_fn *, void *);
+void *Rast3d_cache_new_read(int, int, int, read_fn *, void *);
+int Rast3d_cache_lock(RASTER3D_cache *, int);
+void Rast3d_cache_lock_intern(RASTER3D_cache *, int);
+int Rast3d_cache_unlock(RASTER3D_cache *, int);
+int Rast3d_cache_unlock_all(RASTER3D_cache *);
+int Rast3d_cache_lock_all(RASTER3D_cache *);
+void Rast3d_cache_autolock_on(RASTER3D_cache *);
+void Rast3d_cache_autolock_off(RASTER3D_cache *);
+void Rast3d_cache_set_minUnlock(RASTER3D_cache *, int);
+int Rast3d_cache_remove_elt(RASTER3D_cache *, int);
+int Rast3d_cache_flush(RASTER3D_cache *, int);
+int Rast3d_cache_remove_all(RASTER3D_cache *);
+int Rast3d_cache_flush_all(RASTER3D_cache *);
+void *Rast3d_cache_elt_ptr(RASTER3D_cache *, int);
+int Rast3d_cache_load(RASTER3D_cache *, int);
+int Rast3d_cache_get_elt(RASTER3D_cache *, int, void *);
+int Rast3d_cache_put_elt(RASTER3D_cache *, int, const void *);
/* cachehash.c */
-void G3d_cache_hash_reset(G3d_cache_hash *);
-void G3d_cache_hash_dispose(G3d_cache_hash *);
-void *G3d_cache_hash_new(int);
-void G3d_cache_hash_remove_name(G3d_cache_hash *, int);
-void G3d_cache_hash_load_name(G3d_cache_hash *, int, int);
-int G3d_cache_hash_name2index(G3d_cache_hash *, int);
+void Rast3d_cache_hash_reset(Rast3d_cache_hash *);
+void Rast3d_cache_hash_dispose(Rast3d_cache_hash *);
+void *Rast3d_cache_hash_new(int);
+void Rast3d_cache_hash_remove_name(Rast3d_cache_hash *, int);
+void Rast3d_cache_hash_load_name(Rast3d_cache_hash *, int, int);
+int Rast3d_cache_hash_name2index(Rast3d_cache_hash *, int);
/* changeprecision.c */
-void G3d_changePrecision(void *, int, const char *);
+void Rast3d_changePrecision(void *, int, const char *);
/* changetype.c */
-void G3d_changeType(void *, const char *);
+void Rast3d_changeType(void *, const char *);
/* filecompare.c */
-void G3d_compareFiles(const char *, const char *, const char *, const char *);
+void Rast3d_compareFiles(const char *, const char *, const char *, const char *);
/* filename.c */
-void G3d_filename(char *, const char *, const char *, const char *);
+void Rast3d_filename(char *, const char *, const char *, const char *);
/* find_grid3.c */
char *G_find_grid3(const char *, const char *);
@@ -59,239 +59,239 @@
int G_fpcompress_readXdrDoubles(int, char *, int, int, int, char *);
/* g3dalloc.c */
-void *G3d_malloc(int);
-void *G3d_realloc(void *, int);
-void G3d_free(void *);
+void *Rast3d_malloc(int);
+void *Rast3d_realloc(void *, int);
+void Rast3d_free(void *);
/* g3dcache.c */
-int G3d_initCache(RASTER3D_Map *, int);
-int G3d_disposeCache(RASTER3D_Map *);
-int G3d_flushAllTiles(RASTER3D_Map *);
+int Rast3d_initCache(RASTER3D_Map *, int);
+int Rast3d_disposeCache(RASTER3D_Map *);
+int Rast3d_flushAllTiles(RASTER3D_Map *);
/* g3dcats.c */
-int G3d_writeCats(const char *, struct Categories *);
-int G3d_readCats(const char *, const char *, struct Categories *);
+int Rast3d_writeCats(const char *, struct Categories *);
+int Rast3d_readCats(const char *, const char *, struct Categories *);
/* g3dclose.c */
-int G3d_closeCell(RASTER3D_Map *);
+int Rast3d_closeCell(RASTER3D_Map *);
/* g3dcolor.c */
-int G3d_removeColor(const char *);
-int G3d_readColors(const char *, const char *, struct Colors *);
-int G3d_writeColors(const char *, const char *, struct Colors *);
+int Rast3d_removeColor(const char *);
+int Rast3d_readColors(const char *, const char *, struct Colors *);
+int Rast3d_writeColors(const char *, const char *, struct Colors *);
/* g3ddefaults.c */
-void G3d_setCompressionMode(int, int, int, int);
-void G3d_getCompressionMode(int *, int *, int *, int *);
-void G3d_setCacheSize(int);
-int G3d_getCacheSize(void);
-void G3d_setCacheLimit(int);
-int G3d_getCacheLimit(void);
-void G3d_setFileType(int);
-int G3d_getFileType(void);
-void G3d_setTileDimension(int, int, int);
-void G3d_getTileDimension(int *, int *, int *);
-void G3d_setErrorFun(void (*)(const char *));
-void G3d_setUnit(const char *);
-void G3d_initDefaults(void);
+void Rast3d_setCompressionMode(int, int, int, int);
+void Rast3d_getCompressionMode(int *, int *, int *, int *);
+void Rast3d_setCacheSize(int);
+int Rast3d_getCacheSize(void);
+void Rast3d_setCacheLimit(int);
+int Rast3d_getCacheLimit(void);
+void Rast3d_setFileType(int);
+int Rast3d_getFileType(void);
+void Rast3d_setTileDimension(int, int, int);
+void Rast3d_getTileDimension(int *, int *, int *);
+void Rast3d_setErrorFun(void (*)(const char *));
+void Rast3d_setUnit(const char *);
+void Rast3d_initDefaults(void);
/* g3ddoubleio.c */
-int G3d_writeDoubles(int, int, const double *, int);
-int G3d_readDoubles(int, int, double *, int);
+int Rast3d_writeDoubles(int, int, const double *, int);
+int Rast3d_readDoubles(int, int, double *, int);
/* g3derror.c */
-void G3d_skipError(const char *);
-void G3d_printError(const char *);
-void G3d_fatalError(const char *, ...) __attribute__ ((format(printf, 1, 2)))
+void Rast3d_skipError(const char *);
+void Rast3d_printError(const char *);
+void Rast3d_fatalError(const char *, ...) __attribute__ ((format(printf, 1, 2)))
__attribute__ ((noreturn));
-void G3d_fatalError_noargs(const char *) __attribute__ ((noreturn));
-void G3d_error(const char *, ...) __attribute__ ((format(printf, 1, 2)));
+void Rast3d_fatalError_noargs(const char *) __attribute__ ((noreturn));
+void Rast3d_error(const char *, ...) __attribute__ ((format(printf, 1, 2)));
/* g3dfpxdr.c */
-int G3d_isXdrNullNum(const void *, int);
-int G3d_isXdrNullFloat(const float *);
-int G3d_isXdrNullDouble(const double *);
-void G3d_setXdrNullNum(void *, int);
-void G3d_setXdrNullDouble(double *);
-void G3d_setXdrNullFloat(float *);
-int G3d_initFpXdr(RASTER3D_Map *, int);
-int G3d_initCopyToXdr(RASTER3D_Map *, int);
-int G3d_copyToXdr(const void *, int);
-int G3d_initCopyFromXdr(RASTER3D_Map *, int);
-int G3d_copyFromXdr(int, void *);
+int Rast3d_isXdrNullNum(const void *, int);
+int Rast3d_isXdrNullFloat(const float *);
+int Rast3d_isXdrNullDouble(const double *);
+void Rast3d_setXdrNullNum(void *, int);
+void Rast3d_setXdrNullDouble(double *);
+void Rast3d_setXdrNullFloat(float *);
+int Rast3d_initFpXdr(RASTER3D_Map *, int);
+int Rast3d_initCopyToXdr(RASTER3D_Map *, int);
+int Rast3d_copyToXdr(const void *, int);
+int Rast3d_initCopyFromXdr(RASTER3D_Map *, int);
+int Rast3d_copyFromXdr(int, void *);
/* g3dhistory.c */
-int G3d_writeHistory(const char *, struct History *);
-int G3d_readHistory(const char *, const char *, struct History *);
+int Rast3d_writeHistory(const char *, struct History *);
+int Rast3d_readHistory(const char *, const char *, struct History *);
/* g3dintio.c */
-int G3d_writeInts(int, int, const int *, int);
-int G3d_readInts(int, int, int *, int);
+int Rast3d_writeInts(int, int, const int *, int);
+int Rast3d_readInts(int, int, int *, int);
/* g3dkeys.c */
-int G3d_keyGetInt(struct Key_Value *, const char *, int *);
-int G3d_keyGetDouble(struct Key_Value *, const char *, double *);
-int G3d_keyGetString(struct Key_Value *, const char *, char **);
-int G3d_keyGetValue(struct Key_Value *, const char *, char *, char *, int,
+int Rast3d_keyGetInt(struct Key_Value *, const char *, int *);
+int Rast3d_keyGetDouble(struct Key_Value *, const char *, double *);
+int Rast3d_keyGetString(struct Key_Value *, const char *, char **);
+int Rast3d_keyGetValue(struct Key_Value *, const char *, char *, char *, int,
int, int *);
-int G3d_keySetInt(struct Key_Value *, const char *, const int *);
-int G3d_keySetDouble(struct Key_Value *, const char *, const double *);
-int G3d_keySetString(struct Key_Value *, const char *, char *const *);
-int G3d_keySetValue(struct Key_Value *, const char *, const char *,
+int Rast3d_keySetInt(struct Key_Value *, const char *, const int *);
+int Rast3d_keySetDouble(struct Key_Value *, const char *, const double *);
+int Rast3d_keySetString(struct Key_Value *, const char *, char *const *);
+int Rast3d_keySetValue(struct Key_Value *, const char *, const char *,
const char *, int, int, const int *);
/* g3dlong.c */
-int G3d_longEncode(long *, unsigned char *, int);
-void G3d_longDecode(unsigned char *, long *, int, int);
+int Rast3d_longEncode(long *, unsigned char *, int);
+void Rast3d_longDecode(unsigned char *, long *, int, int);
/* g3dmapset.c */
-void G3d_makeMapsetMapDirectory(const char *);
+void Rast3d_makeMapsetMapDirectory(const char *);
/* g3dmask.c */
-int G3d_maskClose(void);
-int G3d_maskFileExists(void);
-int G3d_maskOpenOld(void);
-int G3d_maskReopen(int);
-int G3d_isMasked(RASTER3D_Map *, int, int, int);
-void G3d_maskNum(RASTER3D_Map *, int, int, int, void *, int);
-void G3d_maskFloat(RASTER3D_Map *, int, int, int, float *);
-void G3d_maskDouble(RASTER3D_Map *, int, int, int, double *);
-void G3d_maskTile(RASTER3D_Map *, int, void *, int);
-void G3d_maskOn(RASTER3D_Map *);
-void G3d_maskOff(RASTER3D_Map *);
-int G3d_maskIsOn(RASTER3D_Map *);
-int G3d_maskIsOff(RASTER3D_Map *);
-const char *G3d_maskFile(void);
-int G3d_maskMapExists(void);
+int Rast3d_maskClose(void);
+int Rast3d_maskFileExists(void);
+int Rast3d_maskOpenOld(void);
+int Rast3d_maskReopen(int);
+int Rast3d_isMasked(RASTER3D_Map *, int, int, int);
+void Rast3d_maskNum(RASTER3D_Map *, int, int, int, void *, int);
+void Rast3d_maskFloat(RASTER3D_Map *, int, int, int, float *);
+void Rast3d_maskDouble(RASTER3D_Map *, int, int, int, double *);
+void Rast3d_maskTile(RASTER3D_Map *, int, void *, int);
+void Rast3d_maskOn(RASTER3D_Map *);
+void Rast3d_maskOff(RASTER3D_Map *);
+int Rast3d_maskIsOn(RASTER3D_Map *);
+int Rast3d_maskIsOff(RASTER3D_Map *);
+const char *Rast3d_maskFile(void);
+int Rast3d_maskMapExists(void);
/* maskfn.c */
-int G3d_mask_d_select(DCELL *, d_Mask *);
-DCELL G3d_mask_match_d_interval(DCELL, d_Interval *);
-void G3d_parse_vallist(char **, d_Mask **);
+int Rast3d_mask_d_select(DCELL *, d_Mask *);
+DCELL Rast3d_mask_match_d_interval(DCELL, d_Interval *);
+void Rast3d_parse_vallist(char **, d_Mask **);
/* g3dmisc.c */
-int G3d_g3dType2cellType(int);
-void G3d_copyFloat2Double(const float *, int, double *, int, int);
-void G3d_copyDouble2Float(const double *, int, float *, int, int);
-void G3d_copyValues(const void *, int, int, void *, int, int, int);
-int G3d_length(int);
-int G3d_externLength(int);
+int Rast3d_g3dType2cellType(int);
+void Rast3d_copyFloat2Double(const float *, int, double *, int, int);
+void Rast3d_copyDouble2Float(const double *, int, float *, int, int);
+void Rast3d_copyValues(const void *, int, int, void *, int, int, int);
+int Rast3d_length(int);
+int Rast3d_externLength(int);
/* g3dnull.c */
-int G3d_isNullValueNum(const void *, int);
-void G3d_setNullValue(void *, int, int);
+int Rast3d_isNullValueNum(const void *, int);
+void Rast3d_setNullValue(void *, int, int);
/* g3dopen2.c */
-void *G3d_openNewParam(const char *, int , int, RASTER3D_Region *, int, int, int, int, int, int, int);
+void *Rast3d_openNewParam(const char *, int , int, RASTER3D_Region *, int, int, int, int, int, int, int);
/* g3dopen.c */
-void *G3d_openCellOldNoHeader(const char *, const char *);
-void *G3d_openCellOld(const char *, const char *, RASTER3D_Region *, int, int);
-void *G3d_openCellNew(const char *, int, int, RASTER3D_Region *);
-void *G3d_openNewOptTileSize(const char *, int , RASTER3D_Region * , int , int );
+void *Rast3d_openCellOldNoHeader(const char *, const char *);
+void *Rast3d_openCellOld(const char *, const char *, RASTER3D_Region *, int, int);
+void *Rast3d_openCellNew(const char *, int, int, RASTER3D_Region *);
+void *Rast3d_openNewOptTileSize(const char *, int , RASTER3D_Region * , int , int );
/* g3dparam.c */
-void G3d_setStandard3dInputParams(void);
-int G3d_getStandard3dParams(int *, int *, int *, int *, int *, int *, int *,
+void Rast3d_setStandard3dInputParams(void);
+int Rast3d_getStandard3dParams(int *, int *, int *, int *, int *, int *, int *,
int *, int *, int *, int *, int *);
-void G3d_setWindowParams(void);
-char *G3d_getWindowParams(void);
+void Rast3d_setWindowParams(void);
+char *Rast3d_getWindowParams(void);
/* g3drange.c */
-void G3d_range_updateFromTile(RASTER3D_Map *, const void *, int, int, int, int,
+void Rast3d_range_updateFromTile(RASTER3D_Map *, const void *, int, int, int, int,
int, int, int, int);
-int G3d_readRange(const char *, const char *, struct FPRange *);
-int G3d_range_load(RASTER3D_Map *);
-void G3d_range_min_max(RASTER3D_Map *, double *, double *);
-int G3d_range_write(RASTER3D_Map *);
-int G3d_range_init(RASTER3D_Map *);
+int Rast3d_readRange(const char *, const char *, struct FPRange *);
+int Rast3d_range_load(RASTER3D_Map *);
+void Rast3d_range_min_max(RASTER3D_Map *, double *, double *);
+int Rast3d_range_write(RASTER3D_Map *);
+int Rast3d_range_init(RASTER3D_Map *);
/* g3dregion.c */
-void G3d_getRegionValue(RASTER3D_Map *, double, double, double, void *, int);
-void G3d_adjustRegion(RASTER3D_Region *);
-void G3d_regionCopy(RASTER3D_Region *, RASTER3D_Region *);
-void G3d_incorporate2dRegion(struct Cell_head *, RASTER3D_Region *);
-void G3d_regionFromToCellHead(struct Cell_head *, RASTER3D_Region *);
-void G3d_adjustRegionRes(RASTER3D_Region *);
-void G3d_extract2dRegion(RASTER3D_Region *, struct Cell_head *);
-void G3d_regionToCellHead(RASTER3D_Region *, struct Cell_head *);
-int G3d_readRegionMap(const char *, const char *, RASTER3D_Region *);
-int G3d_isValidLocation(RASTER3D_Region *, double, double, double);
-void G3d_location2coord(RASTER3D_Region *, double, double, double, int *, int *, int *);
-void G3d_location2coord2(RASTER3D_Region *, double, double, double, int *, int *, int *);
-void G3d_coord2location(RASTER3D_Region *, double, double, double, double *, double *, double *);
+void Rast3d_getRegionValue(RASTER3D_Map *, double, double, double, void *, int);
+void Rast3d_adjustRegion(RASTER3D_Region *);
+void Rast3d_regionCopy(RASTER3D_Region *, RASTER3D_Region *);
+void Rast3d_incorporate2dRegion(struct Cell_head *, RASTER3D_Region *);
+void Rast3d_regionFromToCellHead(struct Cell_head *, RASTER3D_Region *);
+void Rast3d_adjustRegionRes(RASTER3D_Region *);
+void Rast3d_extract2dRegion(RASTER3D_Region *, struct Cell_head *);
+void Rast3d_regionToCellHead(RASTER3D_Region *, struct Cell_head *);
+int Rast3d_readRegionMap(const char *, const char *, RASTER3D_Region *);
+int Rast3d_isValidLocation(RASTER3D_Region *, double, double, double);
+void Rast3d_location2coord(RASTER3D_Region *, double, double, double, int *, int *, int *);
+void Rast3d_location2coord2(RASTER3D_Region *, double, double, double, int *, int *, int *);
+void Rast3d_coord2location(RASTER3D_Region *, double, double, double, double *, double *, double *);
/* g3dresample.c */
-void G3d_nearestNeighbor(RASTER3D_Map *, int, int, int, void *, int);
-void G3d_setResamplingFun(RASTER3D_Map *, void (*)());
-void G3d_getResamplingFun(RASTER3D_Map *, void (**)());
-void G3d_getNearestNeighborFunPtr(void (**)());
+void Rast3d_nearestNeighbor(RASTER3D_Map *, int, int, int, void *, int);
+void Rast3d_setResamplingFun(RASTER3D_Map *, void (*)());
+void Rast3d_getResamplingFun(RASTER3D_Map *, void (**)());
+void Rast3d_getNearestNeighborFunPtr(void (**)());
/* g3dvolume.c */
-void G3d_getVolumeA(void *, double[2][2][2][3], int, int, int, void *, int);
-void G3d_getVolume(void *, double, double, double, double, double, double,
+void Rast3d_getVolumeA(void *, double[2][2][2][3], int, int, int, void *, int);
+void Rast3d_getVolume(void *, double, double, double, double, double, double,
double, double, double, double, double, double, int, int,
int, void *, int);
-void G3d_getAlignedVolume(void *, double, double, double, double, double,
+void Rast3d_getAlignedVolume(void *, double, double, double, double, double,
double, int, int, int, void *, int);
-void G3d_makeAlignedVolumeFile(void *, const char *, double, double, double,
+void Rast3d_makeAlignedVolumeFile(void *, const char *, double, double, double,
double, double, double, int, int, int);
/* g3dwindow.c */
-void G3d_getValue(RASTER3D_Map *, int, int, int, void *, int);
-float G3d_getFloat(RASTER3D_Map *, int, int, int);
-double G3d_getDouble(RASTER3D_Map *, int, int, int);
-void G3d_getWindowValue(RASTER3D_Map *, double, double, double, void *, int);
+void Rast3d_getValue(RASTER3D_Map *, int, int, int, void *, int);
+float Rast3d_getFloat(RASTER3D_Map *, int, int, int);
+double Rast3d_getDouble(RASTER3D_Map *, int, int, int);
+void Rast3d_getWindowValue(RASTER3D_Map *, double, double, double, void *, int);
-RASTER3D_Region *G3d_windowPtr(void);
-void G3d_setWindow(RASTER3D_Region *);
-void G3d_setWindowMap(RASTER3D_Map *, RASTER3D_Region *);
-void G3d_getWindow(RASTER3D_Region *);
+RASTER3D_Region *Rast3d_windowPtr(void);
+void Rast3d_setWindow(RASTER3D_Region *);
+void Rast3d_setWindowMap(RASTER3D_Map *, RASTER3D_Region *);
+void Rast3d_getWindow(RASTER3D_Region *);
/* g3dwindowio.c */
-void G3d_useWindowParams(void);
-int G3d_readWindow(RASTER3D_Region *, const char *);
+void Rast3d_useWindowParams(void);
+int Rast3d_readWindow(RASTER3D_Region *, const char *);
-/* int G3d_writeWindow (RASTER3D_Region *, char *); */
+/* int Rast3d_writeWindow (RASTER3D_Region *, char *); */
/* getblock.c */
-void G3d_getBlockNocache(RASTER3D_Map *, int, int, int, int, int, int, void *,
+void Rast3d_getBlockNocache(RASTER3D_Map *, int, int, int, int, int, int, void *,
int);
-void G3d_getBlock(RASTER3D_Map *, int, int, int, int, int, int, void *, int);
+void Rast3d_getBlock(RASTER3D_Map *, int, int, int, int, int, int, void *, int);
/* header.c */
-int G3d_readHeader(RASTER3D_Map *, int *, int *, double *, double *, double *,
+int Rast3d_readHeader(RASTER3D_Map *, int *, int *, double *, double *, double *,
double *, double *, double *, int *, int *, int *,
double *, double *, double *, int *, int *, int *, int *,
int *, int *, int *, int *, int *, int *, int *, char **);
-int G3d_writeHeader(RASTER3D_Map *, int, int, double, double, double, double,
+int Rast3d_writeHeader(RASTER3D_Map *, int, int, double, double, double, double,
double, double, int, int, int, double, double, double,
int, int, int, int, int, int, int, int, int, int, int,
char *);
-int G3d_cacheSizeEncode(int, int);
-int G3d__computeCacheSize(RASTER3D_Map *, int);
-int G3d_fillHeader(RASTER3D_Map *, int, int, int, int, int, int, int, int, int,
+int Rast3d_cacheSizeEncode(int, int);
+int Rast3d__computeCacheSize(RASTER3D_Map *, int);
+int Rast3d_fillHeader(RASTER3D_Map *, int, int, int, int, int, int, int, int, int,
int, int, int, int, int, int, int, double, double, double,
double, double, double, int, int, int, double, double,
double, char *);
/* headerinfo.c */
-void G3d_getCoordsMap(RASTER3D_Map *, int *, int *, int *);
-void G3d_getCoordsMapWindow(RASTER3D_Map *, int *, int *, int *);
-void G3d_getNofTilesMap(RASTER3D_Map *, int *, int *, int *);
-void G3d_getRegionMap(RASTER3D_Map *, double *, double *, double *, double *,
+void Rast3d_getCoordsMap(RASTER3D_Map *, int *, int *, int *);
+void Rast3d_getCoordsMapWindow(RASTER3D_Map *, int *, int *, int *);
+void Rast3d_getNofTilesMap(RASTER3D_Map *, int *, int *, int *);
+void Rast3d_getRegionMap(RASTER3D_Map *, double *, double *, double *, double *,
double *, double *);
-void G3d_getWindowMap(RASTER3D_Map *, double *, double *, double *, double *,
+void Rast3d_getWindowMap(RASTER3D_Map *, double *, double *, double *, double *,
double *, double *);
-void G3d_getTileDimensionsMap(RASTER3D_Map *, int *, int *, int *);
-int G3d_tileTypeMap(RASTER3D_Map *);
-int G3d_fileTypeMap(RASTER3D_Map *);
-int G3d_tilePrecisionMap(RASTER3D_Map *);
-int G3d_tileUseCacheMap(RASTER3D_Map *);
-void G3d_printHeader(RASTER3D_Map *);
-void G3d_getRegionStructMap(RASTER3D_Map *, RASTER3D_Region *);
+void Rast3d_getTileDimensionsMap(RASTER3D_Map *, int *, int *, int *);
+int Rast3d_tileTypeMap(RASTER3D_Map *);
+int Rast3d_fileTypeMap(RASTER3D_Map *);
+int Rast3d_tilePrecisionMap(RASTER3D_Map *);
+int Rast3d_tileUseCacheMap(RASTER3D_Map *);
+void Rast3d_printHeader(RASTER3D_Map *);
+void Rast3d_getRegionStructMap(RASTER3D_Map *, RASTER3D_Region *);
/* index.c */
-int G3d_flushIndex(RASTER3D_Map *);
-int G3d_initIndex(RASTER3D_Map *, int);
+int Rast3d_flushIndex(RASTER3D_Map *);
+int Rast3d_initIndex(RASTER3D_Map *, int);
/* retile.c */
-void G3d_retile(void *, const char *, int, int, int);
+void Rast3d_retile(void *, const char *, int, int, int);
/* rle.c */
int G_rle_count_only(char *, int, int);
@@ -299,62 +299,62 @@
void G_rle_decode(char *, char *, int, int, int *, int *);
/* tilealloc.c */
-void *G3d_allocTilesType(RASTER3D_Map *, int, int);
-void *G3d_allocTiles(RASTER3D_Map *, int);
-void G3d_freeTiles(void *);
+void *Rast3d_allocTilesType(RASTER3D_Map *, int, int);
+void *Rast3d_allocTiles(RASTER3D_Map *, int);
+void Rast3d_freeTiles(void *);
/* tileio.c */
-void *G3d_getTilePtr(RASTER3D_Map *, int);
-int G3d_tileLoad(RASTER3D_Map *, int);
-int G3d__removeTile(RASTER3D_Map *, int);
-float G3d_getFloatRegion(RASTER3D_Map *, int, int, int);
-double G3d_getDoubleRegion(RASTER3D_Map *, int, int, int);
-void G3d_getValueRegion(RASTER3D_Map *, int, int, int, void *, int);
+void *Rast3d_getTilePtr(RASTER3D_Map *, int);
+int Rast3d_tileLoad(RASTER3D_Map *, int);
+int Rast3d__removeTile(RASTER3D_Map *, int);
+float Rast3d_getFloatRegion(RASTER3D_Map *, int, int, int);
+double Rast3d_getDoubleRegion(RASTER3D_Map *, int, int, int);
+void Rast3d_getValueRegion(RASTER3D_Map *, int, int, int, void *, int);
/* tilemath.c */
-void G3d_computeOptimalTileDimension(RASTER3D_Region *, int, int *, int *, int *, int);
-void G3d_tileIndex2tile(RASTER3D_Map *, int, int *, int *, int *);
-int G3d_tile2tileIndex(RASTER3D_Map *, int, int, int);
-void G3d_tileCoordOrigin(RASTER3D_Map *, int, int, int, int *, int *, int *);
-void G3d_tileIndexOrigin(RASTER3D_Map *, int, int *, int *, int *);
-void G3d_coord2tileCoord(RASTER3D_Map *, int, int, int, int *, int *, int *, int *,
+void Rast3d_computeOptimalTileDimension(RASTER3D_Region *, int, int *, int *, int *, int);
+void Rast3d_tileIndex2tile(RASTER3D_Map *, int, int *, int *, int *);
+int Rast3d_tile2tileIndex(RASTER3D_Map *, int, int, int);
+void Rast3d_tileCoordOrigin(RASTER3D_Map *, int, int, int, int *, int *, int *);
+void Rast3d_tileIndexOrigin(RASTER3D_Map *, int, int *, int *, int *);
+void Rast3d_coord2tileCoord(RASTER3D_Map *, int, int, int, int *, int *, int *, int *,
int *, int *);
-void G3d_coord2tileIndex(RASTER3D_Map *, int, int, int, int *, int *);
-int G3d_coordInRange(RASTER3D_Map *, int, int, int);
-int G3d_tileIndexInRange(RASTER3D_Map *, int);
-int G3d_tileInRange(RASTER3D_Map *, int, int, int);
-int G3d_computeClippedTileDimensions(RASTER3D_Map *, int, int *, int *, int *,
+void Rast3d_coord2tileIndex(RASTER3D_Map *, int, int, int, int *, int *);
+int Rast3d_coordInRange(RASTER3D_Map *, int, int, int);
+int Rast3d_tileIndexInRange(RASTER3D_Map *, int);
+int Rast3d_tileInRange(RASTER3D_Map *, int, int, int);
+int Rast3d_computeClippedTileDimensions(RASTER3D_Map *, int, int *, int *, int *,
int *, int *, int *);
/* tilenull.c */
-void G3d_setNullTileType(RASTER3D_Map *, void *, int);
-void G3d_setNullTile(RASTER3D_Map *, void *);
+void Rast3d_setNullTileType(RASTER3D_Map *, void *, int);
+void Rast3d_setNullTile(RASTER3D_Map *, void *);
/* tileread.c */
-int G3d_readTile(RASTER3D_Map *, int, void *, int);
-int G3d_readTileFloat(RASTER3D_Map *, int, void *);
-int G3d_readTileDouble(RASTER3D_Map *, int, void *);
-int G3d_lockTile(RASTER3D_Map *, int);
-int G3d_unlockTile(RASTER3D_Map *, int);
-int G3d_unlockAll(RASTER3D_Map *);
-void G3d_autolockOn(RASTER3D_Map *);
-void G3d_autolockOff(RASTER3D_Map *);
-void G3d_minUnlocked(RASTER3D_Map *, int);
-int G3d_beginCycle(RASTER3D_Map *);
-int G3d_endCycle(RASTER3D_Map *);
+int Rast3d_readTile(RASTER3D_Map *, int, void *, int);
+int Rast3d_readTileFloat(RASTER3D_Map *, int, void *);
+int Rast3d_readTileDouble(RASTER3D_Map *, int, void *);
+int Rast3d_lockTile(RASTER3D_Map *, int);
+int Rast3d_unlockTile(RASTER3D_Map *, int);
+int Rast3d_unlockAll(RASTER3D_Map *);
+void Rast3d_autolockOn(RASTER3D_Map *);
+void Rast3d_autolockOff(RASTER3D_Map *);
+void Rast3d_minUnlocked(RASTER3D_Map *, int);
+int Rast3d_beginCycle(RASTER3D_Map *);
+int Rast3d_endCycle(RASTER3D_Map *);
/* tilewrite.c */
-int G3d_writeTile(RASTER3D_Map *, int, const void *, int);
-int G3d_writeTileFloat(RASTER3D_Map *, int, const void *);
-int G3d_writeTileDouble(RASTER3D_Map *, int, const void *);
-int G3d_flushTile(RASTER3D_Map *, int);
-int G3d_flushTileCube(RASTER3D_Map *, int, int, int, int, int, int);
-int G3d_flushTilesInCube(RASTER3D_Map *, int, int, int, int, int, int);
-int G3d_putFloat(RASTER3D_Map *, int, int, int, float);
-int G3d_putDouble(RASTER3D_Map *, int, int, int, double);
-int G3d_putValue(RASTER3D_Map *, int, int, int, const void *, int);
+int Rast3d_writeTile(RASTER3D_Map *, int, const void *, int);
+int Rast3d_writeTileFloat(RASTER3D_Map *, int, const void *);
+int Rast3d_writeTileDouble(RASTER3D_Map *, int, const void *);
+int Rast3d_flushTile(RASTER3D_Map *, int);
+int Rast3d_flushTileCube(RASTER3D_Map *, int, int, int, int, int, int);
+int Rast3d_flushTilesInCube(RASTER3D_Map *, int, int, int, int, int, int);
+int Rast3d_putFloat(RASTER3D_Map *, int, int, int, float);
+int Rast3d_putDouble(RASTER3D_Map *, int, int, int, double);
+int Rast3d_putValue(RASTER3D_Map *, int, int, int, const void *, int);
/* writeascii.c */
-void G3d_writeAscii(void *, const char *);
+void Rast3d_writeAscii(void *, const char *);
#endif /* RASTER3DDEFS */
Modified: grass/trunk/lib/gpde/N_arrays.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/N_arrays.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -886,7 +886,7 @@
G_debug(6,
"N_is_array_3d_value_null: null value is of type DCELL_TYPE at pos [%i][%i][%i]",
depth, row, col);
- return G3d_isNullValueNum((void *)
+ return Rast3d_isNullValueNum((void *)
&(data->
fcell_array[depth *
(data->rows_intern *
@@ -898,7 +898,7 @@
G_debug(6,
"N_is_array_3d_value_null: null value is of type DCELL_TYPE at pos [%i][%i][%i]",
depth, row, col);
- return G3d_isNullValueNum((void *)
+ return Rast3d_isNullValueNum((void *)
&(data->
dcell_array[depth *
(data->rows_intern *
@@ -912,7 +912,7 @@
G_debug(6,
"N_is_array_3d_value_null: null value is of type DCELL_TYPE at pos [%i][%i][%i]",
depth, row, col);
- return G3d_isNullValueNum((void *)
+ return Rast3d_isNullValueNum((void *)
&(data->
fcell_array[(depth +
data->offset) *
@@ -928,7 +928,7 @@
G_debug(6,
"N_is_array_3d_value_null: null value is of type DCELL_TYPE at pos [%i][%i][%i]",
depth, row, col);
- return G3d_isNullValueNum((void *)
+ return Rast3d_isNullValueNum((void *)
&(data->
dcell_array[(depth +
data->offset) *
@@ -1082,7 +1082,7 @@
if (data->offset == 0) {
if (data->type == FCELL_TYPE && data->fcell_array != NULL) {
- G3d_setNullValue((void *)
+ Rast3d_setNullValue((void *)
&(data->
fcell_array[depth *
(data->rows_intern *
@@ -1091,7 +1091,7 @@
FCELL_TYPE);
}
else if (data->type == DCELL_TYPE && data->dcell_array != NULL) {
- G3d_setNullValue((void *)
+ Rast3d_setNullValue((void *)
&(data->
dcell_array[depth *
(data->rows_intern *
@@ -1102,7 +1102,7 @@
}
else {
if (data->type == FCELL_TYPE && data->fcell_array != NULL) {
- G3d_setNullValue((void *)
+ Rast3d_setNullValue((void *)
&(data->
fcell_array[(depth +
data->offset) *
@@ -1116,7 +1116,7 @@
FCELL_TYPE);
}
else if (data->type == DCELL_TYPE && data->dcell_array != NULL) {
- G3d_setNullValue((void *)
+ Rast3d_setNullValue((void *)
&(data->
dcell_array[(depth +
data->offset) *
Modified: grass/trunk/lib/gpde/N_arrays_calc.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_calc.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/N_arrays_calc.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -522,7 +522,7 @@
i++) {
null = 0;
if (source->type == FCELL_TYPE) {
- if (G3d_isNullValueNum
+ if (Rast3d_isNullValueNum
((void *)&(source->fcell_array[i]), FCELL_TYPE))
null = 1;
@@ -531,7 +531,7 @@
}
if (target->type == DCELL_TYPE) {
if (null)
- G3d_setNullValue((void *)&(target->dcell_array[i]), 1,
+ Rast3d_setNullValue((void *)&(target->dcell_array[i]), 1,
DCELL_TYPE);
else
target->dcell_array[i] = (double)source->fcell_array[i];
@@ -539,13 +539,13 @@
}
if (source->type == DCELL_TYPE) {
- if (G3d_isNullValueNum
+ if (Rast3d_isNullValueNum
((void *)&(source->dcell_array[i]), DCELL_TYPE))
null = 1;
if (target->type == FCELL_TYPE) {
if (null)
- G3d_setNullValue((void *)&(target->fcell_array[i]), 1,
+ Rast3d_setNullValue((void *)&(target->fcell_array[i]), 1,
FCELL_TYPE);
else
target->fcell_array[i] = (float)source->dcell_array[i];
@@ -596,19 +596,19 @@
v2 = 0.0;
if (a->type == FCELL_TYPE) {
- if (!G3d_isNullValueNum((void *)&(a->fcell_array[i]), FCELL_TYPE))
+ if (!Rast3d_isNullValueNum((void *)&(a->fcell_array[i]), FCELL_TYPE))
v1 = (double)a->fcell_array[i];
}
if (a->type == DCELL_TYPE) {
- if (!G3d_isNullValueNum((void *)&(a->dcell_array[i]), DCELL_TYPE))
+ if (!Rast3d_isNullValueNum((void *)&(a->dcell_array[i]), DCELL_TYPE))
v1 = (double)a->dcell_array[i];
}
if (b->type == FCELL_TYPE) {
- if (!G3d_isNullValueNum((void *)&(b->fcell_array[i]), FCELL_TYPE))
+ if (!Rast3d_isNullValueNum((void *)&(b->fcell_array[i]), FCELL_TYPE))
v2 = (double)b->fcell_array[i];
}
if (b->type == DCELL_TYPE) {
- if (!G3d_isNullValueNum((void *)&(b->dcell_array[i]), DCELL_TYPE))
+ if (!Rast3d_isNullValueNum((void *)&(b->dcell_array[i]), DCELL_TYPE))
v2 = (double)b->dcell_array[i];
}
@@ -859,7 +859,7 @@
if (a->type == FCELL_TYPE)
for (i = 0; i < a->cols_intern * a->rows_intern * a->depths_intern;
i++) {
- if (G3d_isNullValueNum((void *)&(a->fcell_array[i]), FCELL_TYPE)) {
+ if (Rast3d_isNullValueNum((void *)&(a->fcell_array[i]), FCELL_TYPE)) {
a->fcell_array[i] = 0.0;
count++;
}
@@ -868,7 +868,7 @@
if (a->type == DCELL_TYPE)
for (i = 0; i < a->cols_intern * a->rows_intern * a->depths_intern;
i++) {
- if (G3d_isNullValueNum((void *)&(a->dcell_array[i]), DCELL_TYPE)) {
+ if (Rast3d_isNullValueNum((void *)&(a->dcell_array[i]), DCELL_TYPE)) {
a->dcell_array[i] = 0.0;
count++;
}
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -242,7 +242,7 @@
* <br><br>
*
* The new created or the provided array is returned.
- * If the reading of the volume map fails, G3d_fatalError() will
+ * If the reading of the volume map fails, Rast3d_fatalError() will
* be invoked.
*
* \param name * char - the name of an existing volume map
@@ -262,7 +262,7 @@
/*get the current region */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
cols = region.cols;
rows = region.rows;
@@ -270,17 +270,17 @@
if (NULL == G_find_grid3(name, ""))
- G3d_fatalError(_("Requested g3d map <%s> not found"), name);
+ Rast3d_fatalError(_("Requested g3d map <%s> not found"), name);
/*Open all maps with default region */
map =
- G3d_openCellOld(name, G_find_grid3(name, ""), RASTER3D_DEFAULT_WINDOW,
+ Rast3d_openCellOld(name, G_find_grid3(name, ""), RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), name);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), name);
- type = G3d_tileTypeMap(map);
+ type = Rast3d_tileTypeMap(map);
/*if the array is NULL create a new one with the data type of the volume map */
/*the offset is 0 by default */
@@ -310,10 +310,10 @@
/*if requested set the Mask on */
if (mask) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -324,7 +324,7 @@
for (y = 0; y < rows; y++) {
for (x = 0; x < cols; x++) {
if (type == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &f1, type);
+ Rast3d_getValue(map, x, y, z, &f1, type);
if (Rast_is_f_null_value((void *)&f1)) {
N_put_array_3d_value_null(data, x, y, z);
}
@@ -336,7 +336,7 @@
}
}
else {
- G3d_getValue(map, x, y, z, &d1, type);
+ Rast3d_getValue(map, x, y, z, &d1, type);
if (Rast_is_d_null_value((void *)&d1)) {
N_put_array_3d_value_null(data, x, y, z);
}
@@ -354,14 +354,14 @@
/*We set the Mask off, if it was off before */
if (mask) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
/* Close files and exit */
- if (!G3d_closeCell(map))
- G3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
return data;
}
@@ -372,7 +372,7 @@
* A new volume map is created with the same type as the N_array_3d.
* The current region is used to open the volume map.
* The N_array_3d must have the same size as the current region.
- * If the writing of the volume map fails, G3d_fatalError() will
+ * If the writing of the volume map fails, Rast3d_fatalError() will
* be invoked.
*
*
@@ -392,7 +392,7 @@
RASTER3D_Region region;
/*get the current region */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
cols = region.cols;
rows = region.rows;
@@ -412,21 +412,21 @@
/*Open the new map */
if (type == DCELL_TYPE)
- map = G3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
else if (type == FCELL_TYPE)
- map = G3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, ®ion, FCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, ®ion, FCELL_TYPE, 32);
if (map == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), name);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), name);
G_message(_("Write 3d array to g3d map <%s>"), name);
/*if requested set the Mask on */
if (mask) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -439,11 +439,11 @@
for (x = 0; x < cols; x++) {
if (type == FCELL_TYPE) {
f1 = N_get_array_3d_f_value(data, x, y, z);
- G3d_putFloat(map, x, y, z, f1);
+ Rast3d_putFloat(map, x, y, z, f1);
}
else if (type == DCELL_TYPE) {
d1 = N_get_array_3d_d_value(data, x, y, z);
- G3d_putDouble(map, x, y, z, d1);
+ Rast3d_putDouble(map, x, y, z, d1);
}
}
}
@@ -451,17 +451,17 @@
/*We set the Mask off, if it was off before */
if (mask) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
/* Flush all tile */
- if (!G3d_flushAllTiles(map))
- G3d_fatalError("Error flushing tiles with G3d_flushAllTiles");
+ if (!Rast3d_flushAllTiles(map))
+ Rast3d_fatalError("Error flushing tiles with Rast3d_flushAllTiles");
/* Close files and exit */
- if (!G3d_closeCell(map))
- G3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
return;
}
Modified: grass/trunk/lib/gpde/N_geom.c
===================================================================
--- grass/trunk/lib/gpde/N_geom.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/N_geom.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -90,7 +90,7 @@
/*convert the 3d into a 2d region and begin the area calculation */
G_get_set_window(®ion2d); /*this function is not thread safe */
- G3d_regionToCellHead(region3d, ®ion2d);
+ Rast3d_regionToCellHead(region3d, ®ion2d);
}
return N_init_geom_data_2d(®ion2d, geom);
Modified: grass/trunk/lib/gpde/test/test_arrays.c
===================================================================
--- grass/trunk/lib/gpde/test/test_arrays.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/test/test_arrays.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -834,8 +834,8 @@
N_free_array_3d(data2);
/*Set the defaults */
- G3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(®ion);
data1 =
N_alloc_array_3d(region.cols, region.rows, region.depths, 0,
Modified: grass/trunk/lib/gpde/test/test_geom.c
===================================================================
--- grass/trunk/lib/gpde/test/test_geom.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/gpde/test/test_geom.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -60,10 +60,10 @@
G_get_set_window(®ion2d);
/*Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/*get the current region */
- G3d_getWindow(®ion3d);
+ Rast3d_getWindow(®ion3d);
geom = N_alloc_geom_data();
if (!geom) {
Modified: grass/trunk/lib/ogsf/GVL2.c
===================================================================
--- grass/trunk/lib/ogsf/GVL2.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/ogsf/GVL2.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -36,8 +36,8 @@
*/
void GVL_libinit(void)
{
- G3d_initDefaults();
- G3d_getWindow(&wind3);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(&wind3);
Region[0] = wind3.north;
Region[1] = wind3.south;
Modified: grass/trunk/lib/ogsf/Gvl3.c
===================================================================
--- grass/trunk/lib/ogsf/Gvl3.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/ogsf/Gvl3.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -44,7 +44,7 @@
if (NULL == (colors = (struct Colors *)G_malloc(sizeof(struct Colors))))
return (-1);
- if (0 > G3d_readColors(name, mapset, colors)) {
+ if (0 > Rast3d_readColors(name, mapset, colors)) {
G_free(colors);
return (-1);
}
Modified: grass/trunk/lib/ogsf/gvl_file.c
===================================================================
--- grass/trunk/lib/ogsf/gvl_file.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/ogsf/gvl_file.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -431,7 +431,7 @@
/* open g3d file */
map =
- G3d_openCellOld(filename, mapset, RASTER3D_DEFAULT_WINDOW,
+ Rast3d_openCellOld(filename, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (!map) {
G_warning(_("Unable to open 3D raster map <%s>"), filename);
@@ -439,15 +439,15 @@
}
/* load range into range structure of map */
- if (!G3d_range_load(map)) {
+ if (!Rast3d_range_load(map)) {
G_warning(_("Unable to read range of 3D raster map <%s>"), filename);
return (NULL);
}
- G3d_range_min_max(map, min, max);
+ Rast3d_range_min_max(map, min, max);
/* get file data type */
- itype = G3d_fileTypeMap(map);
+ itype = Rast3d_fileTypeMap(map);
if (itype == FCELL_TYPE)
*type = VOL_DTYPE_FLOAT;
if (itype == DCELL_TYPE)
@@ -467,7 +467,7 @@
int close_g3d_file(void *map)
{
/* close opened g3d file */
- if (G3d_closeCell((RASTER3D_Map *) map) != 1) {
+ if (Rast3d_closeCell((RASTER3D_Map *) map) != 1) {
G_warning(_("Unable to close 3D raster map <%s>"),
((RASTER3D_Map *) map)->fileName);
return (-1);
@@ -492,12 +492,12 @@
switch (type) {
/* float data type */
case (VOL_DTYPE_FLOAT):
- *((float *)value) = G3d_getFloat(map, x, y, z);
+ *((float *)value) = Rast3d_getFloat(map, x, y, z);
break;
/* double data type */
case (VOL_DTYPE_DOUBLE):
- *((double *)value) = G3d_getDouble(map, x, y, z);
+ *((double *)value) = Rast3d_getDouble(map, x, y, z);
break;
/* unsupported data type */
@@ -529,7 +529,7 @@
for (x = 0; x < Cols; x++) {
for (y = 0; y < Rows; y++) {
((float *)data)[x + y * Cols] =
- G3d_getFloat(map, x, y, level);
+ Rast3d_getFloat(map, x, y, level);
}
}
@@ -540,7 +540,7 @@
for (x = 0; x < Cols; x++) {
for (y = 0; y < Rows; y++) {
((double *)data)[x + y * Cols] =
- G3d_getDouble(map, x, y, level);
+ Rast3d_getDouble(map, x, y, level);
}
}
@@ -575,7 +575,7 @@
for (y = 0; y < Rows; y++) {
for (z = 0; z < Depths; z++) {
((float *)data)[x + y * Cols + z * Rows * Cols] =
- G3d_getFloat(map, x, y, z);
+ Rast3d_getFloat(map, x, y, z);
}
}
}
@@ -588,7 +588,7 @@
for (y = 0; y < Rows; y++) {
for (z = 0; z < Depths; z++) {
((double *)data)[x + y * Cols + z * Rows * Cols] =
- G3d_getDouble(map, x, y, z);
+ Rast3d_getDouble(map, x, y, z);
}
}
}
@@ -618,12 +618,12 @@
switch (type) {
/* float data type */
case (VOL_DTYPE_FLOAT):
- return G3d_isNullValueNum(value, FCELL_TYPE);
+ return Rast3d_isNullValueNum(value, FCELL_TYPE);
break;
/* double data type */
case (VOL_DTYPE_DOUBLE):
- return G3d_isNullValueNum(value, DCELL_TYPE);
+ return Rast3d_isNullValueNum(value, DCELL_TYPE);
break;
/* unsupported data type */
Modified: grass/trunk/lib/raster3d/G3d.h_unused
===================================================================
--- grass/trunk/lib/raster3d/G3d.h_unused 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/G3d.h_unused 2011-08-10 17:27:10 UTC (rev 47537)
@@ -58,39 +58,39 @@
/*---------------------------------------------------------------------------*/
-extern void *G3d_openCellOldNoHeader (/* name */);
+extern void *Rast3d_openCellOldNoHeader (/* name */);
-extern void *G3d_openCellOld (/* name, cache */);
-extern void *G3d_openCellOld_NEW (/* name, cache */);
-extern void *G3d_openCellNew (/* name, cache, compression, type,
+extern void *Rast3d_openCellOld (/* name, cache */);
+extern void *Rast3d_openCellOld_NEW (/* name, cache */);
+extern void *Rast3d_openCellNew (/* name, cache, compression, type,
tileX, tileY, tileZ,
xMin, yMin, zMin, xMax, yMax, zMax */);
-extern void *G3d_openGrid3File (/* name, x, y, z */);
-extern void *G3d_malloc (/* nBytes */);
-extern void *G3d_realloc (/* ptr, nBytes */);
-extern char *G3d_allocTiles (/* map, nofTiles */);
-extern char *G3d_allocTilesType (/* map, nofTiles, type */);
-extern char *G3d_getTilePtr (/* map, tileIndex */);
+extern void *Rast3d_openGrid3File (/* name, x, y, z */);
+extern void *Rast3d_malloc (/* nBytes */);
+extern void *Rast3d_realloc (/* ptr, nBytes */);
+extern char *Rast3d_allocTiles (/* map, nofTiles */);
+extern char *Rast3d_allocTilesType (/* map, nofTiles, type */);
+extern char *Rast3d_getTilePtr (/* map, tileIndex */);
-extern float G3d_getFloat (/* map, x, y, z */);
-extern double G3d_getDouble (/* map, x, y, z */);
-extern float G3d_getFloatRegion (/* map, x, y, z */);
-extern double G3d_getDoubleRegion (/* map, x, y, z */);
+extern float Rast3d_getFloat (/* map, x, y, z */);
+extern double Rast3d_getDouble (/* map, x, y, z */);
+extern float Rast3d_getFloatRegion (/* map, x, y, z */);
+extern double Rast3d_getDoubleRegion (/* map, x, y, z */);
-extern void *G3d_cache_new ();
-extern void *G3d_cache_new_read ();
-extern char *G3d_cache_elt_ptr (/* c, name */);
+extern void *Rast3d_cache_new ();
+extern void *Rast3d_cache_new_read ();
+extern char *Rast3d_cache_elt_ptr (/* c, name */);
-extern void *G3d_cache_hash_new (/* nofNames */);
+extern void *Rast3d_cache_hash_new (/* nofNames */);
-extern void G3d_skipError (/* msg */);
-extern void G3d_printError (/* msg */);
-/*extern void *G3d_maskFile ();
+extern void Rast3d_skipError (/* msg */);
+extern void Rast3d_printError (/* msg */);
+/*extern void *Rast3d_maskFile ();
*/
-extern void G3d_setWindow (/* window */);
-/*extern void G3d_getWindow ();*/
-extern RASTER3D_Region *G3d_windowPtr ();
+extern void Rast3d_setWindow (/* window */);
+/*extern void Rast3d_getWindow ();*/
+extern RASTER3D_Region *Rast3d_windowPtr ();
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/alloc.c
===================================================================
--- grass/trunk/lib/raster3d/alloc.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/alloc.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -13,7 +13,7 @@
* \brief
*
* Same as <em>malloc (nBytes)</em>, except that in case of error
- * <tt>G3d_error()</tt> is invoked.
+ * <tt>Rast3d_error()</tt> is invoked.
*
* \param nBytes
* \return void *: a pointer ... if successful,
@@ -21,7 +21,7 @@
*/
-void *G3d_malloc(int nBytes)
+void *Rast3d_malloc(int nBytes)
{
void *buf;
@@ -30,7 +30,7 @@
if ((buf = malloc(nBytes)) != NULL)
return buf;
- G3d_error("G3d_malloc: out of memory");
+ Rast3d_error("Rast3d_malloc: out of memory");
return (void *)NULL;
}
@@ -39,7 +39,7 @@
* \brief
*
* Same as <em>realloc (ptr, nBytes)</em>, except that in case of error
- * <tt>G3d_error()</tt> is invoked.
+ * <tt>Rast3d_error()</tt> is invoked.
*
* \param ptr
* \param nBytes
@@ -47,14 +47,14 @@
* NULL ... otherwise.
*/
-void *G3d_realloc(void *ptr, int nBytes)
+void *Rast3d_realloc(void *ptr, int nBytes)
{
if (nBytes <= 0)
nBytes = 1;
if ((ptr = realloc(ptr, nBytes)) != NULL)
return ptr;
- G3d_error("G3d_realloc: out of memory");
+ Rast3d_error("Rast3d_realloc: out of memory");
return (void *)NULL;
}
@@ -68,7 +68,7 @@
* \return void
*/
-void G3d_free(void *buf)
+void Rast3d_free(void *buf)
{
free(buf);
}
Modified: grass/trunk/lib/raster3d/cache.c
===================================================================
--- grass/trunk/lib/raster3d/cache.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/cache.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -11,8 +11,8 @@
{
RASTER3D_Map *map = closure;
- if (!G3d_readTile(map, tileIndex, tileBuf, map->typeIntern)) {
- G3d_error("cacheRead_readFun: error in G3d_readTile");
+ if (!Rast3d_readTile(map, tileIndex, tileBuf, map->typeIntern)) {
+ Rast3d_error("cacheRead_readFun: error in Rast3d_readTile");
return 0;
}
return 1;
@@ -22,11 +22,11 @@
static int initCacheRead(RASTER3D_Map * map, int nCached)
{
- map->cache = G3d_cache_new_read(nCached,
+ map->cache = Rast3d_cache_new_read(nCached,
map->tileSize * map->numLengthIntern,
map->nTiles, cacheRead_readFun, map);
if (map->cache == NULL) {
- G3d_error("initCacheRead: error in G3d_cache_new_read");
+ Rast3d_error("initCacheRead: error in Rast3d_cache_new_read");
return 0;
}
@@ -62,8 +62,8 @@
pos = map->index[tileIndex];
/* tile has already been flushed onto output file or does not exist yet */
- if (pos >= -1) { /* note, G3d_readTile takes care of the case pos == -1 */
- G3d_readTile(map, tileIndex, tileBuf, map->typeIntern);
+ if (pos >= -1) { /* note, Rast3d_readTile takes care of the case pos == -1 */
+ Rast3d_readTile(map, tileIndex, tileBuf, map->typeIntern);
return 1;
}
@@ -77,11 +77,11 @@
/* seek tile and read it into buffer */
if (lseek(map->cacheFD, offs, SEEK_SET) == -1) {
- G3d_error("cacheWrite_readFun: can't position file");
+ Rast3d_error("cacheWrite_readFun: can't position file");
return 0;
}
if (read(map->cacheFD, tileBuf, nBytes) != nBytes) {
- G3d_error("cacheWrite_readFun: can't read file");
+ Rast3d_error("cacheWrite_readFun: can't read file");
return 0;
}
@@ -103,21 +103,21 @@
offsLast = map->cachePosLast * (nBytes + sizeof(int));
if (lseek(map->cacheFD, offsLast, SEEK_SET) == -1) {
- G3d_error("cacheWrite_readFun: can't position file");
+ Rast3d_error("cacheWrite_readFun: can't position file");
return 0;
}
if (read(map->cacheFD, xdr, nBytes + sizeof(int)) != nBytes + sizeof(int)) {
- G3d_error("cacheWrite_readFun: can't read file");
+ Rast3d_error("cacheWrite_readFun: can't read file");
return 0;
}
if (lseek(map->cacheFD, offs, SEEK_SET) == -1) {
- G3d_error("cacheWrite_readFun: can't position file");
+ Rast3d_error("cacheWrite_readFun: can't position file");
return 0;
}
if (write(map->cacheFD, xdr, nBytes + sizeof(int)) !=
nBytes + sizeof(int)) {
- G3d_error("cacheWrite_readFun: can't write file");
+ Rast3d_error("cacheWrite_readFun: can't write file");
return 0;
}
@@ -146,15 +146,15 @@
offs = map->cachePosLast * (nBytes + sizeof(int));
if (lseek(map->cacheFD, offs, SEEK_SET) == -1) {
- G3d_error("cacheWrite_writeFun: can't position file");
+ Rast3d_error("cacheWrite_writeFun: can't position file");
return 0;
}
if (write(map->cacheFD, tileBuf, nBytes) != nBytes) {
- G3d_error("cacheWrite_writeFun: can't write file");
+ Rast3d_error("cacheWrite_writeFun: can't write file");
return 0;
}
if (write(map->cacheFD, &tileIndex, sizeof(int)) != sizeof(int)) {
- G3d_error("cacheWrite_writeFun: can't write file");
+ Rast3d_error("cacheWrite_writeFun: can't write file");
return 0;
}
@@ -169,14 +169,14 @@
{
if (map->cacheFD >= 0) {
if (close(map->cacheFD) != 0) {
- G3d_error("disposeCacheWrite: could not close file");
+ Rast3d_error("disposeCacheWrite: could not close file");
return 0;
}
remove(map->cacheFileName);
- G3d_free(map->cacheFileName);
+ Rast3d_free(map->cacheFileName);
}
- G3d_cache_dispose(map->cache);
+ Rast3d_cache_dispose(map->cache);
return 1;
}
@@ -189,13 +189,13 @@
map->cacheFD = open(map->cacheFileName, O_RDWR | O_CREAT | O_TRUNC, 0666);
if (map->cacheFD < 0) {
- G3d_error("initCacheWrite: could not open file");
+ Rast3d_error("initCacheWrite: could not open file");
return 0;
}
map->cachePosLast = -1;
- map->cache = G3d_cache_new(nCached,
+ map->cache = Rast3d_cache_new(nCached,
map->tileSize * map->numLengthIntern,
map->nTiles,
cacheWrite_writeFun, map,
@@ -203,7 +203,7 @@
if (map->cache == NULL) {
disposeCacheWrite(map);
- G3d_error("initCacheWrite: error in G3d_cache_new");
+ Rast3d_error("initCacheWrite: error in Rast3d_cache_new");
return 0;
}
@@ -212,18 +212,18 @@
/*---------------------------------------------------------------------------*/
-int G3d_initCache(RASTER3D_Map * map, int nCached)
+int Rast3d_initCache(RASTER3D_Map * map, int nCached)
{
if (map->operation == RASTER3D_READ_DATA) {
if (!initCacheRead(map, nCached)) {
- G3d_error("G3d_initCache: error in initCacheRead");
+ Rast3d_error("Rast3d_initCache: error in initCacheRead");
return 0;
}
return 1;
}
if (!initCacheWrite(map, nCached)) {
- G3d_error("G3d_initCache: error in initCacheWrite");
+ Rast3d_error("Rast3d_initCache: error in initCacheWrite");
return 0;
}
@@ -234,24 +234,24 @@
static int disposeCacheRead(RASTER3D_Map * map)
{
- G3d_cache_dispose(map->cache);
+ Rast3d_cache_dispose(map->cache);
return 1;
}
/*---------------------------------------------------------------------------*/
-int G3d_disposeCache(RASTER3D_Map * map)
+int Rast3d_disposeCache(RASTER3D_Map * map)
{
if (map->operation == RASTER3D_READ_DATA) {
if (!disposeCacheRead(map)) {
- G3d_error("G3d_disposeCache: error in disposeCacheRead");
+ Rast3d_error("Rast3d_disposeCache: error in disposeCacheRead");
return 0;
}
return 1;
}
if (!disposeCacheWrite(map)) {
- G3d_error("G3d_disposeCache: error in disposeCacheWrite");
+ Rast3d_error("Rast3d_disposeCache: error in disposeCacheWrite");
return 0;
}
@@ -265,8 +265,8 @@
{
RASTER3D_Map *map = closure;
- if (!G3d_writeTile(map, tileIndex, tileBuf, map->typeIntern)) {
- G3d_error("cacheFlushFun: error in G3d_writeTile");
+ if (!Rast3d_writeTile(map, tileIndex, tileBuf, map->typeIntern)) {
+ Rast3d_error("cacheFlushFun: error in Rast3d_writeTile");
return 0;
}
@@ -275,21 +275,21 @@
/*---------------------------------------------------------------------------*/
-int G3d_flushAllTiles(RASTER3D_Map * map)
+int Rast3d_flushAllTiles(RASTER3D_Map * map)
{
int tileIndex, nBytes;
long offs;
if (map->operation == RASTER3D_READ_DATA) {
- if (!G3d_cache_remove_all(map->cache)) {
- G3d_error("G3d_flushAllTiles: error in G3d_cache_remove_all");
+ if (!Rast3d_cache_remove_all(map->cache)) {
+ Rast3d_error("Rast3d_flushAllTiles: error in Rast3d_cache_remove_all");
return 0;
}
return 1;
}
/* make cache write into output file instead of cache file */
- G3d_cache_set_removeFun(map->cache, cacheFlushFun, map);
+ Rast3d_cache_set_removeFun(map->cache, cacheFlushFun, map);
/* first flush all the tiles which are in the file cache */
@@ -299,32 +299,32 @@
offs = map->cachePosLast * (nBytes + sizeof(int)) + nBytes;
if (lseek(map->cacheFD, offs, SEEK_SET) == -1) {
- G3d_error("G3d_flushAllTiles: can't position file");
+ Rast3d_error("Rast3d_flushAllTiles: can't position file");
return 0;
}
if (read(map->cacheFD, &tileIndex, sizeof(int)) != sizeof(int)) {
- G3d_error("G3d_flushAllTiles: can't read file");
+ Rast3d_error("Rast3d_flushAllTiles: can't read file");
return 0;
}
- if (!G3d_cache_load(map->cache, tileIndex)) {
- G3d_error("G3d_flushAllTiles: error in G3d_cache_load");
+ if (!Rast3d_cache_load(map->cache, tileIndex)) {
+ Rast3d_error("Rast3d_flushAllTiles: error in Rast3d_cache_load");
return 0;
}
- if (!G3d_cache_flush(map->cache, tileIndex)) {
- G3d_error("G3d_flushAllTiles: error in G3d_cache_flush");
+ if (!Rast3d_cache_flush(map->cache, tileIndex)) {
+ Rast3d_error("Rast3d_flushAllTiles: error in Rast3d_cache_flush");
return 0;
}
}
/* then flush all the tiles which remain in the non-file cache */
- if (!G3d_cache_flush_all(map->cache)) {
- G3d_error("G3d_flushAllTiles: error in G3d_cache_flush_all");
+ if (!Rast3d_cache_flush_all(map->cache)) {
+ Rast3d_error("Rast3d_flushAllTiles: error in Rast3d_cache_flush_all");
return 0;
}
/* now the cache should write into the cache file again */
- G3d_cache_set_removeFun(map->cache, cacheWrite_writeFun, map);
+ Rast3d_cache_set_removeFun(map->cache, cacheWrite_writeFun, map);
return 1;
}
Modified: grass/trunk/lib/raster3d/cache1.c
===================================================================
--- grass/trunk/lib/raster3d/cache1.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/cache1.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -31,7 +31,7 @@
/*---------------------------------------------------------------------------*/
-void G3d_cache_reset(RASTER3D_cache * c)
+void Rast3d_cache_reset(RASTER3D_cache * c)
{
int i;
@@ -50,7 +50,7 @@
c->nofUnlocked = c->nofElts;
c->minUnlocked = 1;
- G3d_cache_hash_reset(c->hash);
+ Rast3d_cache_hash_reset(c->hash);
}
/*---------------------------------------------------------------------------*/
@@ -62,38 +62,38 @@
/*---------------------------------------------------------------------------*/
-void G3d_cache_dispose(RASTER3D_cache * c)
+void Rast3d_cache_dispose(RASTER3D_cache * c)
{
if (c == NULL)
return;
- G3d_cache_hash_dispose(c->hash);
+ Rast3d_cache_hash_dispose(c->hash);
if (c->elts != NULL)
- G3d_free(c->elts);
+ Rast3d_free(c->elts);
if (c->names != NULL)
- G3d_free(c->names);
+ Rast3d_free(c->names);
if (c->locks != NULL)
- G3d_free(c->locks);
+ Rast3d_free(c->locks);
if (c->next != NULL)
- G3d_free(c->next);
+ Rast3d_free(c->next);
if (c->prev != NULL)
- G3d_free(c->prev);
+ Rast3d_free(c->prev);
- G3d_free(c);
+ Rast3d_free(c);
}
/*---------------------------------------------------------------------------*/
-void *G3d_cache_new(int nofElts, int sizeOfElts, int nofNames,
+void *Rast3d_cache_new(int nofElts, int sizeOfElts, int nofNames,
int (*eltRemoveFun) (), void *eltRemoveFunData,
int (*eltLoadFun) (), void *eltLoadFunData)
{
RASTER3D_cache *tmp;
- tmp = G3d_malloc(sizeof(RASTER3D_cache));
+ tmp = Rast3d_malloc(sizeof(RASTER3D_cache));
if (tmp == NULL) {
- G3d_error("G3d_cache_new: error in G3d_malloc");
+ Rast3d_error("Rast3d_cache_new: error in Rast3d_malloc");
return (void *)NULL;
}
@@ -101,17 +101,17 @@
tmp->nofElts = nofElts;
tmp->eltSize = sizeOfElts;
- tmp->elts = G3d_malloc(tmp->eltSize * tmp->nofElts);
- tmp->names = G3d_malloc(sizeof(int) * tmp->nofElts);
- tmp->locks = G3d_malloc(tmp->nofElts);
- tmp->next = G3d_malloc(sizeof(int) * tmp->nofElts);
- tmp->prev = G3d_malloc(sizeof(int) * tmp->nofElts);
+ tmp->elts = Rast3d_malloc(tmp->eltSize * tmp->nofElts);
+ tmp->names = Rast3d_malloc(sizeof(int) * tmp->nofElts);
+ tmp->locks = Rast3d_malloc(tmp->nofElts);
+ tmp->next = Rast3d_malloc(sizeof(int) * tmp->nofElts);
+ tmp->prev = Rast3d_malloc(sizeof(int) * tmp->nofElts);
if ((tmp->elts == NULL) || (tmp->names == NULL) || (tmp->locks == NULL) ||
(tmp->next == NULL) || (tmp->prev == NULL)) {
- G3d_cache_dispose(tmp);
- G3d_error("G3d_cache_new: error in G3d_malloc");
+ Rast3d_cache_dispose(tmp);
+ Rast3d_error("Rast3d_cache_new: error in Rast3d_malloc");
return (void *)NULL;
}
@@ -120,14 +120,14 @@
tmp->eltLoadFun = eltLoadFun;
tmp->eltLoadFunData = eltLoadFunData;
- tmp->hash = G3d_cache_hash_new(nofNames);
+ tmp->hash = Rast3d_cache_hash_new(nofNames);
if (tmp->hash == NULL) {
- G3d_cache_dispose(tmp);
- G3d_error("G3d_cache_new: error in G3d_cache_hash_new");
+ Rast3d_cache_dispose(tmp);
+ Rast3d_error("Rast3d_cache_new: error in Rast3d_cache_hash_new");
return (void *)NULL;
}
- G3d_cache_reset(tmp);
+ Rast3d_cache_reset(tmp);
return tmp;
}
@@ -135,7 +135,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_cache_set_removeFun(RASTER3D_cache * c, int (*eltRemoveFun) (),
+Rast3d_cache_set_removeFun(RASTER3D_cache * c, int (*eltRemoveFun) (),
void *eltRemoveFunData)
{
c->eltRemoveFun = eltRemoveFun;
@@ -145,7 +145,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_cache_set_loadFun(RASTER3D_cache * c, int (*eltLoadFun) (),
+Rast3d_cache_set_loadFun(RASTER3D_cache * c, int (*eltLoadFun) (),
void *eltLoadFunData)
{
c->eltLoadFun = eltLoadFun;
@@ -154,10 +154,10 @@
/*---------------------------------------------------------------------------*/
-void *G3d_cache_new_read(int nofElts, int sizeOfElts, int nofNames,
+void *Rast3d_cache_new_read(int nofElts, int sizeOfElts, int nofNames,
read_fn * eltLoadFun, void *eltLoadFunData)
{
- return G3d_cache_new(nofElts, sizeOfElts, nofNames,
+ return Rast3d_cache_new(nofElts, sizeOfElts, nofNames,
cache_dummy_fun, NULL, eltLoadFun, eltLoadFunData);
}
@@ -166,7 +166,7 @@
static void cache_queue_dequeue(RASTER3D_cache * c, int index)
{
if (IS_NOT_IN_QUEUE_ELT(index))
- G3d_fatalError("cache_queue_dequeue: index not in queue");
+ Rast3d_fatalError("cache_queue_dequeue: index not in queue");
if (index == c->first)
c->first = c->next[index];
@@ -186,18 +186,18 @@
static void cache_queue_enqueue(RASTER3D_cache * c, int left, int index)
{
if (IS_IN_QUEUE_ELT(index))
- G3d_fatalError("cache_queue_enqueue: index already in queue");
+ Rast3d_fatalError("cache_queue_enqueue: index already in queue");
if (c->first == -1) {
if (left != c->last)
- G3d_fatalError("cache_queue_enqueue: position out of range");
+ Rast3d_fatalError("cache_queue_enqueue: position out of range");
c->first = c->last = index;
return;
}
if (IS_NOT_IN_QUEUE_ELT(left))
- G3d_fatalError("cache_queue_enqueue: position not in queue");
+ Rast3d_fatalError("cache_queue_enqueue: position not in queue");
if (left == -1) {
@@ -259,13 +259,13 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_lock(RASTER3D_cache * c, int name)
+int Rast3d_cache_lock(RASTER3D_cache * c, int name)
{
int index;
- index = G3d_cache_hash_name2index(c->hash, name);
+ index = Rast3d_cache_hash_name2index(c->hash, name);
if (index == -1) {
- G3d_error("G3d_cache_lock: name not in cache");
+ Rast3d_error("Rast3d_cache_lock: name not in cache");
return 0;
}
@@ -284,7 +284,7 @@
/*---------------------------------------------------------------------------*/
-void G3d_cache_lock_intern(RASTER3D_cache * c, int index)
+void Rast3d_cache_lock_intern(RASTER3D_cache * c, int index)
{
if (IS_LOCKED_ELT(index))
return;
@@ -295,13 +295,13 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_unlock(RASTER3D_cache * c, int name)
+int Rast3d_cache_unlock(RASTER3D_cache * c, int name)
{
int index;
- index = G3d_cache_hash_name2index(c->hash, name);
+ index = Rast3d_cache_hash_name2index(c->hash, name);
if (index == -1) {
- G3d_error("G3d_cache_unlock: name not in cache");
+ Rast3d_error("Rast3d_cache_unlock: name not in cache");
return 0;
}
@@ -316,14 +316,14 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_unlock_all(RASTER3D_cache * c)
+int Rast3d_cache_unlock_all(RASTER3D_cache * c)
{
int index;
for (index = 0; index < c->nofElts; index++)
if (IS_LOCKED_ELT(index))
- if (!G3d_cache_unlock(c, c->names[index])) {
- G3d_error("G3d_cache_unlock_all: error in G3d_cache_unlock");
+ if (!Rast3d_cache_unlock(c, c->names[index])) {
+ Rast3d_error("Rast3d_cache_unlock_all: error in Rast3d_cache_unlock");
return 0;
}
@@ -332,34 +332,34 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_lock_all(RASTER3D_cache * c)
+int Rast3d_cache_lock_all(RASTER3D_cache * c)
{
int index;
for (index = 0; index < c->nofElts; index++)
if (IS_UNLOCKED_ELT(index))
- G3d_cache_lock_intern(c, index);
+ Rast3d_cache_lock_intern(c, index);
return 1;
}
/*---------------------------------------------------------------------------*/
-void G3d_cache_autolock_on(RASTER3D_cache * c)
+void Rast3d_cache_autolock_on(RASTER3D_cache * c)
{
c->autoLock = 1;
}
/*---------------------------------------------------------------------------*/
-void G3d_cache_autolock_off(RASTER3D_cache * c)
+void Rast3d_cache_autolock_off(RASTER3D_cache * c)
{
c->autoLock = 0;
}
/*---------------------------------------------------------------------------*/
-void G3d_cache_set_minUnlock(RASTER3D_cache * c, int nofMinUnLocked)
+void Rast3d_cache_set_minUnlock(RASTER3D_cache * c, int nofMinUnLocked)
{
c->minUnlocked = nofMinUnLocked;
}
@@ -370,9 +370,9 @@
{
int index;
- index = G3d_cache_hash_name2index(c->hash, name);
+ index = Rast3d_cache_hash_name2index(c->hash, name);
if (index == -1) {
- G3d_error("G3d_cache_deactivate_elt : name not in cache");
+ Rast3d_error("Rast3d_cache_deactivate_elt : name not in cache");
return 0;
}
@@ -387,24 +387,24 @@
if (doFlush)
if (!c->eltRemoveFun(name, c->elts + c->eltSize * index,
c->eltRemoveFunData)) {
- G3d_error("cache_remove_elt: error in c->eltRemoveFun");
+ Rast3d_error("cache_remove_elt: error in c->eltRemoveFun");
return 0;
}
cache_queue_preppend(c, index);
DEACTIVATE_ELT(index);
- G3d_cache_hash_remove_name(c->hash, name);
+ Rast3d_cache_hash_remove_name(c->hash, name);
return 1;
}
/*---------------------------------------------------------------------------*/
-int G3d_cache_remove_elt(RASTER3D_cache * c, int name)
+int Rast3d_cache_remove_elt(RASTER3D_cache * c, int name)
{
if (!cache_remove_elt(c, name, 0)) {
- G3d_error("G3d_cache_remove_elt: error in cache_remove_elt");
+ Rast3d_error("Rast3d_cache_remove_elt: error in cache_remove_elt");
return 0;
}
@@ -413,10 +413,10 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_flush(RASTER3D_cache * c, int name)
+int Rast3d_cache_flush(RASTER3D_cache * c, int name)
{
if (!cache_remove_elt(c, name, 1)) {
- G3d_error("G3d_cache_flush: error in cache_remove_elt");
+ Rast3d_error("Rast3d_cache_flush: error in cache_remove_elt");
return 0;
}
@@ -425,15 +425,15 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_remove_all(RASTER3D_cache * c)
+int Rast3d_cache_remove_all(RASTER3D_cache * c)
{
int index;
for (index = 0; index < c->nofElts; index++)
if (IS_ACTIVE_ELT(index))
- if (!G3d_cache_remove_elt(c, c->names[index])) {
- G3d_error
- ("G3d_cache_remove_all: error in G3d_cache_remove_elt");
+ if (!Rast3d_cache_remove_elt(c, c->names[index])) {
+ Rast3d_error
+ ("Rast3d_cache_remove_all: error in Rast3d_cache_remove_elt");
return 0;
}
@@ -442,14 +442,14 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_flush_all(RASTER3D_cache * c)
+int Rast3d_cache_flush_all(RASTER3D_cache * c)
{
int index;
for (index = 0; index < c->nofElts; index++)
if (IS_ACTIVE_ELT(index))
- if (!G3d_cache_flush(c, c->names[index])) {
- G3d_error("G3d_cache_flush_all: error in G3d_cache_flush");
+ if (!Rast3d_cache_flush(c, c->names[index])) {
+ Rast3d_error("Rast3d_cache_flush_all: error in Rast3d_cache_flush");
return 0;
}
@@ -458,17 +458,17 @@
/*---------------------------------------------------------------------------*/
-void *G3d_cache_elt_ptr(RASTER3D_cache * c, int name)
+void *Rast3d_cache_elt_ptr(RASTER3D_cache * c, int name)
{
int index, oldName, doUnlock;
- index = G3d_cache_hash_name2index(c->hash, name);
+ index = Rast3d_cache_hash_name2index(c->hash, name);
if (index != -1) {
if (c->autoLock)
if (IS_UNLOCKED_ELT(index) && (!ONE_UNLOCKED_ELT_ONLY) &&
(!ARE_MIN_UNLOCKED))
- G3d_cache_lock_intern(c, index);
+ Rast3d_cache_lock_intern(c, index);
return c->elts + c->eltSize * index;
}
@@ -476,30 +476,30 @@
index = c->first;
if (IS_ACTIVE_ELT(index)) {
oldName = c->names[index];
- G3d_cache_hash_remove_name(c->hash, oldName);
+ Rast3d_cache_hash_remove_name(c->hash, oldName);
if (!c->eltRemoveFun(oldName, c->elts + c->eltSize * index,
c->eltRemoveFunData)) {
- G3d_error("G3d_cache_elt_ptr: error in c->eltRemoveFun");
+ Rast3d_error("Rast3d_cache_elt_ptr: error in c->eltRemoveFun");
return NULL;
}
}
- G3d_cache_hash_load_name(c->hash, name, index);
+ Rast3d_cache_hash_load_name(c->hash, name, index);
doUnlock = ((!c->autoLock) || ONE_UNLOCKED_ELT_ONLY || ARE_MIN_UNLOCKED);
UNLOCK_ELT(index);
c->names[index] = name;
- G3d_cache_lock_intern(c, index);
+ Rast3d_cache_lock_intern(c, index);
if (doUnlock)
- if (!G3d_cache_unlock(c, name)) {
- G3d_error("G3d_cache_elt_ptr: error in G3d_cache_unlock");
+ if (!Rast3d_cache_unlock(c, name)) {
+ Rast3d_error("Rast3d_cache_elt_ptr: error in Rast3d_cache_unlock");
return NULL;
}
if (!c->eltLoadFun(name, c->elts + c->eltSize * index, c->eltLoadFunData)) {
- G3d_error("G3d_cache_elt_ptr: error in c->eltLoadFun");
+ Rast3d_error("Rast3d_cache_elt_ptr: error in c->eltLoadFun");
return NULL;
}
@@ -508,10 +508,10 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_load(RASTER3D_cache * c, int name)
+int Rast3d_cache_load(RASTER3D_cache * c, int name)
{
- if (G3d_cache_elt_ptr(c, name) == NULL) {
- G3d_error("G3d_cache_load: error in G3d_cache_elt_ptr");
+ if (Rast3d_cache_elt_ptr(c, name) == NULL) {
+ Rast3d_error("Rast3d_cache_load: error in Rast3d_cache_elt_ptr");
return 0;
}
@@ -520,13 +520,13 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_get_elt(RASTER3D_cache * c, int name, void *dst)
+int Rast3d_cache_get_elt(RASTER3D_cache * c, int name, void *dst)
{
const void *elt;
- elt = G3d_cache_elt_ptr(c, name);
+ elt = Rast3d_cache_elt_ptr(c, name);
if (elt == NULL) {
- G3d_error("G3d_cache_get_elt: error in G3d_cache_elt_ptr");
+ Rast3d_error("Rast3d_cache_get_elt: error in Rast3d_cache_elt_ptr");
return 0;
}
@@ -537,13 +537,13 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_put_elt(RASTER3D_cache * c, int name, const void *src)
+int Rast3d_cache_put_elt(RASTER3D_cache * c, int name, const void *src)
{
void *elt;
- elt = G3d_cache_elt_ptr(c, name);
+ elt = Rast3d_cache_elt_ptr(c, name);
if (elt == NULL) {
- G3d_error("G3d_cache_put_elt: error in G3d_cache_elt_ptr");
+ Rast3d_error("Rast3d_cache_put_elt: error in Rast3d_cache_elt_ptr");
return 0;
}
@@ -568,7 +568,7 @@
int *a;
al = c->autoLock;
- G3d_cache_autolock_off(c);
+ Rast3d_cache_autolock_off(c);
printf("\n--------------------------------\n");
for (i = 0; i < c->nofElts; i++) {
@@ -578,8 +578,8 @@
continue;
}
- a = (int *)G3d_cache_elt_ptr(c, c->names[i]);
- /*G3d_cache_get_elt (c, c->names[i], a); */
+ a = (int *)Rast3d_cache_elt_ptr(c, c->names[i]);
+ /*Rast3d_cache_get_elt (c, c->names[i], a); */
printf("name %d val %d %s\n", c->names[i], a[17],
(IS_LOCKED_ELT(i) ? "locked" :
IS_UNLOCKED_ELT(i) ? "unlocked" : ""));
@@ -587,7 +587,7 @@
printf("\n--------------------------------\n");
if (al)
- G3d_cache_autolock_on(c);
+ Rast3d_cache_autolock_on(c);
}
/*---------------------------------------------------------------------------*/
@@ -630,14 +630,14 @@
static int firstTime = 1;
if (firstTime) {
- ctd.value = G3d_malloc(((RASTER3D_cache *) c)->eltSize * sizeof(int));
+ ctd.value = Rast3d_malloc(((RASTER3D_cache *) c)->eltSize * sizeof(int));
firstTime = 0;
}
ctd.value[17] = val;
ctd.size = ((RASTER3D_cache *) c)->eltSize;
- G3d_cache_load(c, name);
+ Rast3d_cache_load(c, name);
}
/*---------------------------------------------------------------------------*/
@@ -646,10 +646,10 @@
{
void *c;
- c = G3d_cache_new(3, 76 * sizeof(int), 100000,
+ c = Rast3d_cache_new(3, 76 * sizeof(int), 100000,
cache_test_flush_fun, NULL, cache_test_load_fun, &ctd);
- G3d_cache_autolock_on(c);
+ Rast3d_cache_autolock_on(c);
cache_test_print(c);
cache_test_add(c, 1111, -11);
cache_test_print(c);
@@ -659,9 +659,9 @@
cache_test_print(c);
cache_test_add(c, 4444, -44);
cache_test_print(c);
- G3d_cache_unlock_all(c);
+ Rast3d_cache_unlock_all(c);
cache_test_print(c);
- G3d_cache_load(c, 2222);
+ Rast3d_cache_load(c, 2222);
cache_test_print(c);
cache_test_add(c, 5555, -55);
cache_test_print(c);
@@ -673,9 +673,9 @@
cache_test_print(c);
cache_test_add(c, 9999, -99);
cache_test_print(c);
- G3d_cache_flush(c, 9999);
+ Rast3d_cache_flush(c, 9999);
cache_test_print(c);
- G3d_cache_flush_all(c);
+ Rast3d_cache_flush_all(c);
cache_test_print(c);
cache_test_add(c, 1111, -11);
cache_test_print(c);
@@ -683,7 +683,7 @@
cache_test_print(c);
cache_test_add(c, 3333, -33);
cache_test_print(c);
- G3d_cache_reset(c);
+ Rast3d_cache_reset(c);
cache_test_print(c);
cache_test_add(c, 1111, -11);
cache_test_print(c);
Modified: grass/trunk/lib/raster3d/cachehash.c
===================================================================
--- grass/trunk/lib/raster3d/cachehash.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/cachehash.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -17,12 +17,12 @@
int lastIndex;
int lastIndexActive;
-} G3d_cache_hash;
+} Rast3d_cache_hash;
#endif
/*---------------------------------------------------------------------------*/
-void G3d_cache_hash_reset(G3d_cache_hash * h)
+void Rast3d_cache_hash_reset(Rast3d_cache_hash * h)
{
int i;
@@ -34,53 +34,53 @@
/*---------------------------------------------------------------------------*/
-void G3d_cache_hash_dispose(G3d_cache_hash * h)
+void Rast3d_cache_hash_dispose(Rast3d_cache_hash * h)
{
if (h == NULL)
return;
if (h->index != NULL)
- G3d_free(h->index);
+ Rast3d_free(h->index);
if (h->active != NULL)
- G3d_free(h->active);
- G3d_free(h);
+ Rast3d_free(h->active);
+ Rast3d_free(h);
}
/*---------------------------------------------------------------------------*/
-void *G3d_cache_hash_new(int nofNames)
+void *Rast3d_cache_hash_new(int nofNames)
{
- G3d_cache_hash *tmp;
+ Rast3d_cache_hash *tmp;
- tmp = G3d_malloc(sizeof(G3d_cache_hash));
+ tmp = Rast3d_malloc(sizeof(Rast3d_cache_hash));
if (tmp == NULL) {
- G3d_error("G3d_cache_hash_new: error in G3d_malloc");
+ Rast3d_error("Rast3d_cache_hash_new: error in Rast3d_malloc");
return (void *)NULL;
}
tmp->nofNames = nofNames;
- tmp->index = G3d_malloc(sizeof(int) * tmp->nofNames);
- tmp->active = G3d_malloc(sizeof(char) * tmp->nofNames);
+ tmp->index = Rast3d_malloc(sizeof(int) * tmp->nofNames);
+ tmp->active = Rast3d_malloc(sizeof(char) * tmp->nofNames);
if ((tmp->index == NULL) || (tmp->active == NULL)) {
- G3d_cache_hash_dispose(tmp);
- G3d_error("G3d_cache_hash_new: error in G3d_malloc");
+ Rast3d_cache_hash_dispose(tmp);
+ Rast3d_error("Rast3d_cache_hash_new: error in Rast3d_malloc");
return (void *)NULL;
}
- G3d_cache_hash_reset(tmp);
+ Rast3d_cache_hash_reset(tmp);
return tmp;
}
/*---------------------------------------------------------------------------*/
-void G3d_cache_hash_remove_name(G3d_cache_hash * h, int name)
+void Rast3d_cache_hash_remove_name(Rast3d_cache_hash * h, int name)
{
if (name >= h->nofNames)
- G3d_fatalError("G3d_cache_hash_remove_name: name out of range");
+ Rast3d_fatalError("Rast3d_cache_hash_remove_name: name out of range");
if (h->active[name] == 0)
- G3d_fatalError("G3d_cache_hash_remove_name: name not in hashtable");
+ Rast3d_fatalError("Rast3d_cache_hash_remove_name: name not in hashtable");
h->active[name] = 0;
if (name == h->lastName)
@@ -89,13 +89,13 @@
/*---------------------------------------------------------------------------*/
-void G3d_cache_hash_load_name(G3d_cache_hash * h, int name, int index)
+void Rast3d_cache_hash_load_name(Rast3d_cache_hash * h, int name, int index)
{
if (name >= h->nofNames)
- G3d_fatalError("G3d_cache_hash_load_name: name out of range");
+ Rast3d_fatalError("Rast3d_cache_hash_load_name: name out of range");
if (h->active[name] != 0)
- G3d_fatalError("G3d_cache_hash_load_name: name already in hashtable");
+ Rast3d_fatalError("Rast3d_cache_hash_load_name: name already in hashtable");
h->index[name] = index;
h->active[name] = 1;
@@ -103,7 +103,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_cache_hash_name2index(G3d_cache_hash * h, int name)
+int Rast3d_cache_hash_name2index(Rast3d_cache_hash * h, int name)
{
int index;
Modified: grass/trunk/lib/raster3d/cachehash.h
===================================================================
--- grass/trunk/lib/raster3d/cachehash.h 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/cachehash.h 2011-08-10 17:27:10 UTC (rev 47537)
@@ -1 +1 @@
-extern void *G3d_cache_hash_new( /* nofElts */ );
+extern void *Rast3d_cache_hash_new( /* nofElts */ );
Modified: grass/trunk/lib/raster3d/cats.c
===================================================================
--- grass/trunk/lib/raster3d/cats.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/cats.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -26,7 +26,7 @@
* \return int
*/
-int G3d_writeCats(const char *name, struct Categories *cats)
+int Rast3d_writeCats(const char *name, struct Categories *cats)
/* adapted from Rast_write_cats */
{
FILE *fd;
@@ -176,7 +176,7 @@
*/
int
-G3d_readCats(const char *name, const char *mapset, struct Categories *pcats)
+Rast3d_readCats(const char *name, const char *mapset, struct Categories *pcats)
/* adapted from Rast_read_cats */
{
const char *type;
Modified: grass/trunk/lib/raster3d/changeprecision.c
===================================================================
--- grass/trunk/lib/raster3d/changeprecision.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/changeprecision.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -20,7 +20,7 @@
* \return void
*/
-void G3d_changePrecision(void *map, int precision, const char *nameOut)
+void Rast3d_changePrecision(void *map, int precision, const char *nameOut)
{
void *map2;
int x, y, z, savePrecision, saveCompression, saveLzw, saveRle;
@@ -30,47 +30,47 @@
int nx, ny, nz;
int tileXsave, tileYsave, tileZsave, tileX, tileY, tileZ, saveType;
- saveType = G3d_getFileType();
- /* G3d_setFileType (G3d_fileTypeMap (map)); */
- G3d_getCompressionMode(&saveCompression, &saveLzw, &saveRle,
+ saveType = Rast3d_getFileType();
+ /* Rast3d_setFileType (Rast3d_fileTypeMap (map)); */
+ Rast3d_getCompressionMode(&saveCompression, &saveLzw, &saveRle,
&savePrecision);
- G3d_setCompressionMode(RASTER3D_COMPRESSION, saveLzw, saveRle, precision);
- G3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_setTileDimension(tileX, tileY, tileZ);
+ Rast3d_setCompressionMode(RASTER3D_COMPRESSION, saveLzw, saveRle, precision);
+ Rast3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
- typeIntern = G3d_tileTypeMap(map);
- G3d_getRegionStructMap(map, ®ion);
+ typeIntern = Rast3d_tileTypeMap(map);
+ Rast3d_getRegionStructMap(map, ®ion);
map2 =
- G3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, ®ion);
+ Rast3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, ®ion);
if (map2 == NULL)
- G3d_fatalError("G3d_changePrecision: error in G3d_openCellNew");
+ Rast3d_fatalError("Rast3d_changePrecision: error in Rast3d_openCellNew");
- G3d_setFileType(saveType);
- G3d_setCompressionMode(saveCompression, saveLzw, saveRle, savePrecision);
- G3d_setTileDimension(tileXsave, tileYsave, tileZsave);
+ Rast3d_setFileType(saveType);
+ Rast3d_setCompressionMode(saveCompression, saveLzw, saveRle, savePrecision);
+ Rast3d_setTileDimension(tileXsave, tileYsave, tileZsave);
- data = G3d_allocTiles(map, 1);
+ data = Rast3d_allocTiles(map, 1);
if (data == NULL)
- G3d_fatalError("G3d_changePrecision: error in G3d_allocTiles");
- G3d_getNofTilesMap(map2, &nx, &ny, &nz);
+ Rast3d_fatalError("Rast3d_changePrecision: error in Rast3d_allocTiles");
+ Rast3d_getNofTilesMap(map2, &nx, &ny, &nz);
for (z = 0; z < nz; z++)
for (y = 0; y < ny; y++)
for (x = 0; x < nx; x++) {
- if (!G3d_readTile(map, G3d_tile2tileIndex(map, x, y, z), data,
+ if (!Rast3d_readTile(map, Rast3d_tile2tileIndex(map, x, y, z), data,
typeIntern))
- G3d_fatalError
- ("G3d_changePrecision: error in G3d_readTile");
- if (!G3d_writeTile
- (map2, G3d_tile2tileIndex(map2, x, y, z), data,
+ Rast3d_fatalError
+ ("Rast3d_changePrecision: error in Rast3d_readTile");
+ if (!Rast3d_writeTile
+ (map2, Rast3d_tile2tileIndex(map2, x, y, z), data,
typeIntern))
- G3d_fatalError
- ("G3d_changePrecision: error in G3d_writeTile");
+ Rast3d_fatalError
+ ("Rast3d_changePrecision: error in Rast3d_writeTile");
}
- G3d_freeTiles(data);
- if (!G3d_closeCell(map2))
- G3d_fatalError("G3d_changePrecision: error in G3d_closeCell");
+ Rast3d_freeTiles(data);
+ if (!Rast3d_closeCell(map2))
+ Rast3d_fatalError("Rast3d_changePrecision: error in Rast3d_closeCell");
}
Modified: grass/trunk/lib/raster3d/changetype.c
===================================================================
--- grass/trunk/lib/raster3d/changetype.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/changetype.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -21,7 +21,7 @@
* \return void
*/
-void G3d_changeType(void *map, const char *nameOut)
+void Rast3d_changeType(void *map, const char *nameOut)
{
void *map2;
int x, y, z, saveType;
@@ -31,51 +31,51 @@
int tileX, tileY, tileZ, typeIntern, typeIntern2;
int tileXsave, tileYsave, tileZsave, nx, ny, nz;
- saveType = G3d_getFileType();
- G3d_setFileType(G3d_fileTypeMap(map) == FCELL_TYPE ?
+ saveType = Rast3d_getFileType();
+ Rast3d_setFileType(Rast3d_fileTypeMap(map) == FCELL_TYPE ?
DCELL_TYPE : FCELL_TYPE);
- G3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_setTileDimension(tileX, tileY, tileZ);
+ Rast3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
- G3d_getRegionStructMap(map, ®ion);
+ Rast3d_getRegionStructMap(map, ®ion);
map2 =
- G3d_openCellNew(nameOut, FCELL_TYPE, RASTER3D_USE_CACHE_DEFAULT, ®ion);
+ Rast3d_openCellNew(nameOut, FCELL_TYPE, RASTER3D_USE_CACHE_DEFAULT, ®ion);
if (map2 == NULL)
- G3d_fatalError("G3d_changeType: error in G3d_openCellNew");
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_openCellNew");
- G3d_setFileType(saveType);
- G3d_setTileDimension(tileXsave, tileYsave, tileZsave);
+ Rast3d_setFileType(saveType);
+ Rast3d_setTileDimension(tileXsave, tileYsave, tileZsave);
- data = G3d_allocTiles(map, 1);
+ data = Rast3d_allocTiles(map, 1);
if (data == NULL)
- G3d_fatalError("G3d_changeType: error in G3d_allocTiles");
- data2 = G3d_allocTiles(map2, 1);
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_allocTiles");
+ data2 = Rast3d_allocTiles(map2, 1);
if (data2 == NULL)
- G3d_fatalError("G3d_changeType: error in G3d_allocTiles");
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_allocTiles");
- G3d_getNofTilesMap(map2, &nx, &ny, &nz);
- typeIntern = G3d_tileTypeMap(map);
- typeIntern2 = G3d_tileTypeMap(map2);
+ Rast3d_getNofTilesMap(map2, &nx, &ny, &nz);
+ typeIntern = Rast3d_tileTypeMap(map);
+ typeIntern2 = Rast3d_tileTypeMap(map2);
tileSize = tileX * tileY * tileZ;
for (z = 0; z < nz; z++)
for (y = 0; y < ny; y++)
for (x = 0; x < nx; x++) {
- if (!G3d_readTile(map, G3d_tile2tileIndex(map, x, y, z), data,
+ if (!Rast3d_readTile(map, Rast3d_tile2tileIndex(map, x, y, z), data,
typeIntern))
- G3d_fatalError("G3d_changeType: error in G3d_readTile");
- G3d_copyValues(data, 0, typeIntern, data2, 0, typeIntern2,
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_readTile");
+ Rast3d_copyValues(data, 0, typeIntern, data2, 0, typeIntern2,
tileSize);
- if (!G3d_writeTile
- (map2, G3d_tile2tileIndex(map2, x, y, z), data2,
+ if (!Rast3d_writeTile
+ (map2, Rast3d_tile2tileIndex(map2, x, y, z), data2,
typeIntern2))
- G3d_fatalError("G3d_changeType: error in G3d_writeTile");
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_writeTile");
}
- G3d_freeTiles(data);
- G3d_freeTiles(data2);
- if (!G3d_closeCell(map2))
- G3d_fatalError("G3d_changeType: error in G3d_closeCell");
+ Rast3d_freeTiles(data);
+ Rast3d_freeTiles(data2);
+ if (!Rast3d_closeCell(map2))
+ Rast3d_fatalError("Rast3d_changeType: error in Rast3d_closeCell");
}
Modified: grass/trunk/lib/raster3d/close.c
===================================================================
--- grass/trunk/lib/raster3d/close.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/close.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,17 +12,17 @@
/*---------------------------------------------------------------------------*/
-static int G3d_closeNew(RASTER3D_Map * map)
+static int Rast3d_closeNew(RASTER3D_Map * map)
{
char path[GPATH_MAX];
struct Categories cats;
struct History hist;
- G3d_removeColor(map->fileName);
+ Rast3d_removeColor(map->fileName);
/* create empty cats file */
Rast_init_cats(NULL, &cats);
- G3d_writeCats(map->fileName, &cats);
+ Rast3d_writeCats(map->fileName, &cats);
Rast_free_cats(&cats);
/*genrate the history file, use the normal G_ functions */
@@ -30,25 +30,25 @@
Rast_command_history(&hist);
/*Use the G3d function to write the history file,
* otherwise the path is wrong */
- if (!G3d_writeHistory(map->fileName, &hist)) {
- G3d_error("G3d_closeNew: can't write raster3d history");
+ if (!Rast3d_writeHistory(map->fileName, &hist)) {
+ Rast3d_error("Rast3d_closeNew: can't write raster3d history");
}
- G3d_range_write(map);
+ Rast3d_range_write(map);
close(map->data_fd);
/* finally move tempfile to data file */
- G3d_filename(path, RASTER3D_CELL_ELEMENT, map->fileName, map->mapset);
+ Rast3d_filename(path, RASTER3D_CELL_ELEMENT, map->fileName, map->mapset);
#ifdef __MINGW32__
if (CopyFile(map->tempName, path, FALSE) == 0) {
#else
if (link(map->tempName, path) < 0) {
#endif
if (rename(map->tempName, path)) {
- G3d_error
- ("G3d_closeNew: can't move temp raster map %s\nto 3d data file %s",
+ Rast3d_error
+ ("Rast3d_closeNew: can't move temp raster map %s\nto 3d data file %s",
map->tempName, path);
return 0;
}
@@ -61,18 +61,18 @@
/*---------------------------------------------------------------------------*/
-static int G3d_closeCellNew(RASTER3D_Map * map)
+static int Rast3d_closeCellNew(RASTER3D_Map * map)
{
long ltmp;
if (map->useCache)
- if (!G3d_flushAllTiles(map)) {
- G3d_error("G3d_closeCellNew: error in G3d_flushAllTiles");
+ if (!Rast3d_flushAllTiles(map)) {
+ Rast3d_error("Rast3d_closeCellNew: error in Rast3d_flushAllTiles");
return 0;
}
- if (!G3d_flushIndex(map)) {
- G3d_error("G3d_closeCellNew: error in G3d_flushIndex");
+ if (!Rast3d_flushIndex(map)) {
+ Rast3d_error("Rast3d_closeCellNew: error in Rast3d_flushIndex");
return 0;
}
@@ -82,23 +82,23 @@
if (lseek(map->data_fd,
(long)(map->offset - sizeof(int) - sizeof(long)),
SEEK_SET) == -1) {
- G3d_error("G3d_closeCellNew: can't position file");
+ Rast3d_error("Rast3d_closeCellNew: can't position file");
return 0;
}
- if (!G3d_writeInts(map->data_fd, map->useXdr, &(map->indexNbytesUsed), 1)) {
- G3d_error("G3d_closeCellNew: can't write header");
+ if (!Rast3d_writeInts(map->data_fd, map->useXdr, &(map->indexNbytesUsed), 1)) {
+ Rast3d_error("Rast3d_closeCellNew: can't write header");
return 0;
}
- G3d_longEncode(&(map->indexOffset), (unsigned char *)<mp, 1);
+ Rast3d_longEncode(&(map->indexOffset), (unsigned char *)<mp, 1);
if (write(map->data_fd, <mp, sizeof(long)) != sizeof(long)) {
- G3d_error("G3d_closeCellNew: can't write header");
+ Rast3d_error("Rast3d_closeCellNew: can't write header");
return 0;
}
- if (!G3d_closeNew(map) != 0) {
- G3d_error("G3d_closeCellNew: error in G3d_closeNew");
+ if (!Rast3d_closeNew(map) != 0) {
+ Rast3d_error("Rast3d_closeCellNew: error in Rast3d_closeNew");
return 0;
}
@@ -107,10 +107,10 @@
/*---------------------------------------------------------------------------*/
-static int G3d_closeOld(RASTER3D_Map * map)
+static int Rast3d_closeOld(RASTER3D_Map * map)
{
if (close(map->data_fd) != 0) {
- G3d_error("G3d_closeOld: could not close file");
+ Rast3d_error("Rast3d_closeOld: could not close file");
return 0;
}
@@ -119,10 +119,10 @@
/*---------------------------------------------------------------------------*/
-static int G3d_closeCellOld(RASTER3D_Map * map)
+static int Rast3d_closeCellOld(RASTER3D_Map * map)
{
- if (!G3d_closeOld(map) != 0) {
- G3d_error("G3d_closeCellOld: error in G3d_closeOld");
+ if (!Rast3d_closeOld(map) != 0) {
+ Rast3d_error("Rast3d_closeCellOld: error in Rast3d_closeOld");
return 0;
}
@@ -144,35 +144,35 @@
* 0 ... otherwise.
*/
-int G3d_closeCell(RASTER3D_Map * map)
+int Rast3d_closeCell(RASTER3D_Map * map)
{
if (map->operation == RASTER3D_WRITE_DATA) {
- if (!G3d_closeCellNew(map)) {
- G3d_error("G3d_closeCell: error in G3d_closeCellNew");
+ if (!Rast3d_closeCellNew(map)) {
+ Rast3d_error("Rast3d_closeCell: error in Rast3d_closeCellNew");
return 0;
}
}
else {
- if (!G3d_closeCellOld(map) != 0) {
- G3d_error("G3d_closeCell: error in G3d_closeCellOld");
+ if (!Rast3d_closeCellOld(map) != 0) {
+ Rast3d_error("Rast3d_closeCell: error in Rast3d_closeCellOld");
return 0;
}
}
- G3d_free(map->index);
- G3d_free(map->tileLength);
+ Rast3d_free(map->index);
+ Rast3d_free(map->tileLength);
if (map->useCache) {
- if (!G3d_disposeCache(map)) {
- G3d_error("G3d_closeCell: error in G3d_disposeCache");
+ if (!Rast3d_disposeCache(map)) {
+ Rast3d_error("Rast3d_closeCell: error in Rast3d_disposeCache");
return 0;
}
}
else
- G3d_free(map->data);
+ Rast3d_free(map->data);
if (map->operation == RASTER3D_WRITE_DATA)
- if (!G3d_writeHeader(map,
+ if (!Rast3d_writeHeader(map,
map->region.proj, map->region.zone,
map->region.north, map->region.south,
map->region.east, map->region.west,
@@ -186,11 +186,11 @@
map->compression, map->useRle, map->useLzw,
map->precision, map->offset, map->useXdr,
map->hasIndex, map->unit)) {
- G3d_error("G3d_closeCell: error in G3d_writeHeader");
+ Rast3d_error("Rast3d_closeCell: error in Rast3d_writeHeader");
return 0;
}
- G3d_free(map->unit);
- G3d_free(map);
+ Rast3d_free(map->unit);
+ Rast3d_free(map);
return 1;
}
Modified: grass/trunk/lib/raster3d/color.c
===================================================================
--- grass/trunk/lib/raster3d/color.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/color.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -19,7 +19,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_removeColor(const char *name)
+int Rast3d_removeColor(const char *name)
/* adapted from G_remove_colr */
{
return G_remove_misc(RASTER3D_DIRECTORY, RASTER3D_COLOR_ELEMENT, name);
@@ -28,7 +28,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_readColors(const char *name, const char *mapset, struct Colors *colors)
+Rast3d_readColors(const char *name, const char *mapset, struct Colors *colors)
/* adapted from Rast_read_colors */
{
const char *err;
@@ -41,7 +41,7 @@
switch (read_colors(name, mapset, colors)) {
case -2:
- if (G3d_readRange(name, mapset, &drange) >= 0) {
+ if (Rast3d_readRange(name, mapset, &drange) >= 0) {
Rast_get_fp_range_min_max(&drange, &dmin, &dmax);
if (!Rast_is_d_null_value(&dmin) && !Rast_is_d_null_value(&dmax))
Rast_make_rainbow_fp_colors(colors, dmin, dmax);
@@ -324,7 +324,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_writeColors(const char *name, const char *mapset, struct Colors *colors)
+Rast3d_writeColors(const char *name, const char *mapset, struct Colors *colors)
/* adapted from Rast_write_colors */
{
FILE *fd;
Modified: grass/trunk/lib/raster3d/defaults.c
===================================================================
--- grass/trunk/lib/raster3d/defaults.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/defaults.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -17,7 +17,7 @@
#define RASTER3D_TILE_X_DEFAULT 16
#define RASTER3D_TILE_Y_DEFAULT 16
#define RASTER3D_TILE_Z_DEFAULT 8
-#define RASTER3D_ERROR_FUN_DEFAULT G3d_skipError
+#define RASTER3D_ERROR_FUN_DEFAULT Rast3d_skipError
#define RASTER3D_UNIT_DEFAULT "none"
/*---------------------------------------------------------------------------*/
@@ -82,10 +82,10 @@
*/
void
-G3d_setCompressionMode(int doCompress, int doLzw, int doRle, int precision)
+Rast3d_setCompressionMode(int doCompress, int doLzw, int doRle, int precision)
{
if ((doCompress != RASTER3D_NO_COMPRESSION) && (doCompress != RASTER3D_COMPRESSION))
- G3d_fatalError("G3d_setCompressionMode: wrong value for doCompress.");
+ Rast3d_fatalError("Rast3d_setCompressionMode: wrong value for doCompress.");
g3d_do_compression = doCompress;
@@ -93,13 +93,13 @@
return;
if ((doLzw != RASTER3D_NO_LZW) && (doLzw != RASTER3D_USE_LZW))
- G3d_fatalError("G3d_setCompressionMode: wrong value for doLzw.");
+ Rast3d_fatalError("Rast3d_setCompressionMode: wrong value for doLzw.");
if ((doRle != RASTER3D_NO_RLE) && (doRle != RASTER3D_USE_RLE))
- G3d_fatalError("G3d_setCompressionMode: wrong value for doRle.");
+ Rast3d_fatalError("Rast3d_setCompressionMode: wrong value for doRle.");
if (precision < -1)
- G3d_fatalError("G3d_setCompressionMode: wrong value for precision.");
+ Rast3d_fatalError("Rast3d_setCompressionMode: wrong value for precision.");
g3d_do_lzw_compression = doLzw;
g3d_do_rle_compression = doRle;
@@ -122,7 +122,7 @@
*/
void
-G3d_getCompressionMode(int *doCompress, int *doLzw, int *doRle,
+Rast3d_getCompressionMode(int *doCompress, int *doLzw, int *doRle,
int *precision)
{
if (doCompress != NULL)
@@ -147,10 +147,10 @@
* \return void
*/
-void G3d_setCacheSize(int nTiles)
+void Rast3d_setCacheSize(int nTiles)
{
if (nTiles < 0)
- G3d_fatalError("G3d_setCacheSize: size out of range.");
+ Rast3d_fatalError("Rast3d_setCacheSize: size out of range.");
g3d_cache_default = nTiles;
}
@@ -166,7 +166,7 @@
* \return int
*/
-int G3d_getCacheSize()
+int Rast3d_getCacheSize()
{
return g3d_cache_default;
}
@@ -183,10 +183,10 @@
* \return void
*/
-void G3d_setCacheLimit(int nBytes)
+void Rast3d_setCacheLimit(int nBytes)
{
if (nBytes <= 0)
- G3d_fatalError("G3d_setCacheLimit: size out of range.");
+ Rast3d_fatalError("Rast3d_setCacheLimit: size out of range.");
g3d_cache_max = nBytes;
}
@@ -203,7 +203,7 @@
* \return int
*/
-int G3d_getCacheLimit()
+int Rast3d_getCacheLimit()
{
return g3d_cache_max;
}
@@ -220,10 +220,10 @@
* \return void
*/
-void G3d_setFileType(int type)
+void Rast3d_setFileType(int type)
{
if ((type != FCELL_TYPE) && (type != DCELL_TYPE))
- G3d_fatalError("G3d_setFileTypeDefault: invalid type");
+ Rast3d_fatalError("Rast3d_setFileTypeDefault: invalid type");
g3d_file_type = type;
}
@@ -240,7 +240,7 @@
* \return int
*/
-int G3d_getFileType()
+int Rast3d_getFileType()
{
return g3d_file_type;
}
@@ -259,19 +259,19 @@
* \return void
*/
-void G3d_setTileDimension(int tileX, int tileY, int tileZ)
+void Rast3d_setTileDimension(int tileX, int tileY, int tileZ)
{
if ((g3d_tile_dimension[0] = tileX) <= 0)
- G3d_fatalError
- ("G3d_setTileDimension: value for tile x environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_setTileDimension: value for tile x environment variable out of range");
if ((g3d_tile_dimension[1] = tileY) <= 0)
- G3d_fatalError
- ("G3d_setTileDimension: value for tile y environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_setTileDimension: value for tile y environment variable out of range");
if ((g3d_tile_dimension[2] = tileZ) <= 0)
- G3d_fatalError
- ("G3d_setTileDimension: value for tile z environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_setTileDimension: value for tile z environment variable out of range");
}
/*---------------------------------------------------------------------------*/
@@ -288,7 +288,7 @@
* \return void
*/
-void G3d_getTileDimension(int *tileX, int *tileY, int *tileZ)
+void Rast3d_getTileDimension(int *tileX, int *tileY, int *tileZ)
{
*tileX = g3d_tile_dimension[0];
*tileY = g3d_tile_dimension[1];
@@ -307,7 +307,7 @@
* \return void
*/
-void G3d_setErrorFun(void (*fun) (const char *))
+void Rast3d_setErrorFun(void (*fun) (const char *))
{
g3d_error_fun = fun;
}
@@ -324,9 +324,9 @@
* \return void
*/
-void G3d_setUnit(const char *unit)
+void Rast3d_setUnit(const char *unit)
{
- G3d_free(g3d_unit_default);
+ Rast3d_free(g3d_unit_default);
g3d_unit_default = G_store(unit);
}
@@ -344,7 +344,7 @@
* \return void
*/
-void G3d_initDefaults(void)
+void Rast3d_initDefaults(void)
{
static int firstTime = 1;
const char *value, *windowName;
@@ -407,13 +407,13 @@
}
else {
if (sscanf(value, "%d", &g3d_precision) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: precision environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: precision environment variable has invalid value");
}
else {
if (g3d_precision < -1) {
- G3d_fatalError
- ("G3d_initDefaults: value for cache environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for cache environment variable out of range");
}
}
}
@@ -442,12 +442,12 @@
}
else {
if (sscanf(value, "%d", &g3d_cache_default) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: cache environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: cache environment variable has invalid value");
}
if (g3d_cache_default < 0) {
- G3d_fatalError
- ("G3d_initDefaults: value for cache environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for cache environment variable out of range");
}
}
}
@@ -460,12 +460,12 @@
}
else {
if (sscanf(value, "%d", &g3d_cache_max) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: cache environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: cache environment variable has invalid value");
}
if (g3d_cache_max < 0) {
- G3d_fatalError
- ("G3d_initDefaults: value for cache environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for cache environment variable out of range");
}
}
}
@@ -478,12 +478,12 @@
}
else {
if (sscanf(value, "%d", g3d_tile_dimension) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: tile dimension x environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: tile dimension x environment variable has invalid value");
}
if (g3d_tile_dimension[0] <= 0) {
- G3d_fatalError
- ("G3d_initDefaults: value for tile x environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for tile x environment variable out of range");
}
}
@@ -494,12 +494,12 @@
}
else {
if (sscanf(value, "%d", g3d_tile_dimension + 1) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: tile dimension y environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: tile dimension y environment variable has invalid value");
}
if (g3d_tile_dimension[1] <= 0) {
- G3d_fatalError
- ("G3d_initDefaults: value for tile y environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for tile y environment variable out of range");
}
}
@@ -510,12 +510,12 @@
}
else {
if (sscanf(value, "%d", g3d_tile_dimension + 2) != 1) {
- G3d_fatalError
- ("G3d_initDefaults: tile dimension z environment variable has invalid value");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: tile dimension z environment variable has invalid value");
}
if (g3d_tile_dimension[2] <= 0) {
- G3d_fatalError
- ("G3d_initDefaults: value for tile z environment variable out of range");
+ Rast3d_fatalError
+ ("Rast3d_initDefaults: value for tile z environment variable out of range");
}
}
}
@@ -524,13 +524,13 @@
value = getenv(RASTER3D_FATAL_ERROR_ENV_VAR);
if (value != NULL) {
- g3d_error_fun = G3d_fatalError_noargs;
+ g3d_error_fun = Rast3d_fatalError_noargs;
}
else {
value = getenv(RASTER3D_PRINT_ERROR_ENV_VAR);
if (value != NULL) {
- g3d_error_fun = G3d_printError;
+ g3d_error_fun = Rast3d_printError;
}
else {
g3d_error_fun = RASTER3D_ERROR_FUN_DEFAULT;
@@ -541,7 +541,7 @@
if (g3d_unit_default == NULL)
g3d_unit_default = G_store(RASTER3D_UNIT_DEFAULT);
- windowName = G3d_getWindowParams();
+ windowName = Rast3d_getWindowParams();
if (windowName == NULL) {
value = getenv(RASTER3D_DEFAULT_WINDOW3D);
if (value != NULL)
@@ -549,8 +549,8 @@
windowName = value;
}
- if (!G3d_readWindow(&window, windowName))
- G3d_fatalError("G3d_initDefaults: Error reading window");
- G3d_setWindow(&window);
+ if (!Rast3d_readWindow(&window, windowName))
+ Rast3d_fatalError("Rast3d_initDefaults: Error reading window");
+ Rast3d_setWindow(&window);
}
Modified: grass/trunk/lib/raster3d/doubleio.c
===================================================================
--- grass/trunk/lib/raster3d/doubleio.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/doubleio.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -8,7 +8,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_writeDoubles(int fd, int useXdr, const double *i, int nofNum)
+int Rast3d_writeDoubles(int fd, int useXdr, const double *i, int nofNum)
{
int firstTime = 1;
XDR xdrEncodeStream;
@@ -16,11 +16,11 @@
u_int n;
if (nofNum <= 0)
- G3d_fatalError("G3d_writeDoubles: nofNum out of range");
+ Rast3d_fatalError("Rast3d_writeDoubles: nofNum out of range");
if (useXdr == RASTER3D_NO_XDR) {
if (write(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) {
- G3d_error("G3d_writeDoubles: writing to file failed");
+ Rast3d_error("Rast3d_writeDoubles: writing to file failed");
return 0;
}
else {
@@ -41,19 +41,19 @@
n = 1024;
if (!xdr_setpos(&xdrEncodeStream, 0)) {
- G3d_error("G3d_writeDoubles: positioning xdr failed");
+ Rast3d_error("Rast3d_writeDoubles: positioning xdr failed");
return 0;
}
if (!xdr_vector(&xdrEncodeStream, (char *)i, n, sizeof(double),
(xdrproc_t) xdr_double)) {
- G3d_error("G3d_writeDoubles: writing xdr failed");
+ Rast3d_error("Rast3d_writeDoubles: writing xdr failed");
return 0;
}
if (write(fd, xdrDoubleBuf, RASTER3D_XDR_DOUBLE_LENGTH * n) !=
RASTER3D_XDR_DOUBLE_LENGTH * n) {
- G3d_error("G3d_writeDoubles: writing xdr to file failed");
+ Rast3d_error("Rast3d_writeDoubles: writing xdr to file failed");
return 0;
}
@@ -66,7 +66,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_readDoubles(int fd, int useXdr, double *i, int nofNum)
+int Rast3d_readDoubles(int fd, int useXdr, double *i, int nofNum)
{
int firstTime = 1;
XDR xdrDecodeStream;
@@ -74,11 +74,11 @@
u_int n;
if (nofNum <= 0)
- G3d_fatalError("G3d_readDoubles: nofNum out of range");
+ Rast3d_fatalError("Rast3d_readDoubles: nofNum out of range");
if (useXdr == RASTER3D_NO_XDR) {
if (read(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) {
- G3d_error("G3d_readDoubles: reading from file failed");
+ Rast3d_error("Rast3d_readDoubles: reading from file failed");
return 0;
}
else {
@@ -99,18 +99,18 @@
if (read(fd, xdrDoubleBuf, RASTER3D_XDR_DOUBLE_LENGTH * n) !=
RASTER3D_XDR_DOUBLE_LENGTH * n) {
- G3d_error("G3d_readDoubles: reading xdr from file failed");
+ Rast3d_error("Rast3d_readDoubles: reading xdr from file failed");
return 0;
}
if (!xdr_setpos(&xdrDecodeStream, 0)) {
- G3d_error("G3d_readDoubles: positioning xdr failed");
+ Rast3d_error("Rast3d_readDoubles: positioning xdr failed");
return 0;
}
if (!xdr_vector(&xdrDecodeStream, (char *)i, n, sizeof(double),
(xdrproc_t) xdr_double)) {
- G3d_error("G3d_readDoubles: reading xdr failed");
+ Rast3d_error("Rast3d_readDoubles: reading xdr failed");
return 0;
}
Modified: grass/trunk/lib/raster3d/error.c
===================================================================
--- grass/trunk/lib/raster3d/error.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/error.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -22,7 +22,7 @@
* \return void
*/
-void G3d_skipError(const char *msg)
+void Rast3d_skipError(const char *msg)
{
}
@@ -37,7 +37,7 @@
* \return void
*/
-void G3d_printError(const char *msg)
+void Rast3d_printError(const char *msg)
{
fprintf(stderr, "ERROR: ");
fprintf(stderr, msg);
@@ -55,7 +55,7 @@
* \return void
*/
-void G3d_fatalError(const char *msg, ...)
+void Rast3d_fatalError(const char *msg, ...)
{
char buffer[2000]; /* No novels to the error logs, OK? */
va_list ap;
@@ -67,12 +67,12 @@
G_fatal_error("%s", buffer);
}
-void G3d_fatalError_noargs(const char *msg)
+void Rast3d_fatalError_noargs(const char *msg)
{
G_fatal_error("%s", msg);
}
-void G3d_error(const char *msg, ...)
+void Rast3d_error(const char *msg, ...)
{
char buffer[2000]; /* No novels to the error logs, OK? */
va_list ap;
Modified: grass/trunk/lib/raster3d/filecompare.c
===================================================================
--- grass/trunk/lib/raster3d/filecompare.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/filecompare.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -13,41 +13,41 @@
/*---------------------------------------------------------------------------*/
-static void G3d_float2xdrFloat(float *f, float *xdrf)
+static void Rast3d_float2xdrFloat(float *f, float *xdrf)
{
XDR xdrEncodeStream;
xdrmem_create(&xdrEncodeStream, (caddr_t) xdrf, 4, XDR_ENCODE);
if (!xdr_setpos(&xdrEncodeStream, 0))
- G3d_fatalError("G3d_float2xdrFloat: positioning xdr failed");
+ Rast3d_fatalError("Rast3d_float2xdrFloat: positioning xdr failed");
if (!xdr_float(&xdrEncodeStream, f))
- G3d_fatalError("G3d_float2xdrFloat: writing xdr failed");
+ Rast3d_fatalError("Rast3d_float2xdrFloat: writing xdr failed");
xdr_destroy(&xdrEncodeStream);
}
/*---------------------------------------------------------------------------*/
-static void G3d_double2xdrDouble(double *d, double *xdrd)
+static void Rast3d_double2xdrDouble(double *d, double *xdrd)
{
XDR xdrEncodeStream;
xdrmem_create(&xdrEncodeStream, (caddr_t) xdrd, 8, XDR_ENCODE);
if (!xdr_setpos(&xdrEncodeStream, 0))
- G3d_fatalError("G3d_double2xdrDouble: positioning xdr failed");
+ Rast3d_fatalError("Rast3d_double2xdrDouble: positioning xdr failed");
if (!xdr_double(&xdrEncodeStream, d))
- G3d_fatalError("G3d_double2xdrDouble: writing xdr failed");
+ Rast3d_fatalError("Rast3d_double2xdrDouble: writing xdr failed");
xdr_destroy(&xdrEncodeStream);
}
/*---------------------------------------------------------------------------*/
-static void G3d_truncFloat(float *f, int p)
+static void Rast3d_truncFloat(float *f, int p)
{
unsigned char *c;
@@ -78,7 +78,7 @@
/*---------------------------------------------------------------------------*/
-static void G3d_truncDouble(double *d, int p)
+static void Rast3d_truncDouble(double *d, int p)
{
unsigned char *c;
@@ -151,7 +151,7 @@
/*---------------------------------------------------------------------------*/
-static void G3d_float2Double(float *f, double *d)
+static void Rast3d_float2Double(float *f, double *d)
{
unsigned char *c1, *c2, sign, c;
int e;
@@ -191,16 +191,16 @@
/*---------------------------------------------------------------------------*/
-static int G3d_compareFloats(float *f1, int p1, float *f2, int p2)
+static int Rast3d_compareFloats(float *f1, int p1, float *f2, int p2)
{
unsigned char *c1, *c2;
float xdrf1, xdrf2;
- if (G3d_isNullValueNum(f1, FCELL_TYPE))
- return G3d_isNullValueNum(f2, FCELL_TYPE);
+ if (Rast3d_isNullValueNum(f1, FCELL_TYPE))
+ return Rast3d_isNullValueNum(f2, FCELL_TYPE);
- G3d_float2xdrFloat(f1, &xdrf1);
- G3d_float2xdrFloat(f2, &xdrf2);
+ Rast3d_float2xdrFloat(f1, &xdrf1);
+ Rast3d_float2xdrFloat(f2, &xdrf2);
c1 = (unsigned char *)&xdrf1;
c2 = (unsigned char *)&xdrf2;
@@ -208,9 +208,9 @@
/* printf ("%d %d (%d %d %d %d) (%d %d %d %d) %d\n", p1, p2, *c1, *(c1 + 1), *(c1 + 2), *(c1 + 3), *c2, *(c2 + 1), *(c2 + 2), *(c2 + 3), *f1 == *f2); */
if ((p1 != -1) && (p1 < 23) && ((p1 < p2) || (p2 == -1)))
- G3d_truncFloat(&xdrf2, p1);
+ Rast3d_truncFloat(&xdrf2, p1);
if ((p2 != -1) && (p2 < 23) && ((p2 < p1) || (p1 == -1)))
- G3d_truncFloat(&xdrf1, p2);
+ Rast3d_truncFloat(&xdrf1, p2);
/* printf ("%d %d (%d %d %d %d) (%d %d %d %d) %d\n", p1, p2, *c1, *(c1 + 1), *(c1 + 2), *(c1 + 3), *c2, *(c2 + 1), *(c2 + 2), *(c2 + 3), *f1 == *f2); */
@@ -222,16 +222,16 @@
/*---------------------------------------------------------------------------*/
-static int G3d_compareDoubles(double *d1, int p1, double *d2, int p2)
+static int Rast3d_compareDoubles(double *d1, int p1, double *d2, int p2)
{
unsigned char *c1, *c2;
double xdrd1, xdrd2;
- if (G3d_isNullValueNum(d1, DCELL_TYPE))
- return G3d_isNullValueNum(d2, DCELL_TYPE);
+ if (Rast3d_isNullValueNum(d1, DCELL_TYPE))
+ return Rast3d_isNullValueNum(d2, DCELL_TYPE);
- G3d_double2xdrDouble(d1, &xdrd1);
- G3d_double2xdrDouble(d2, &xdrd2);
+ Rast3d_double2xdrDouble(d1, &xdrd1);
+ Rast3d_double2xdrDouble(d2, &xdrd2);
c1 = (unsigned char *)&xdrd1;
c2 = (unsigned char *)&xdrd2;
@@ -239,9 +239,9 @@
/* printf ("%d %d (%d %d %d %d %d %d %d %d) (%d %d %d %d %d %d %d %d)\n", p1, p2, *c1, *(c1 + 1), *(c1 + 2), *(c1 + 3), *(c1 + 4), *(c1 + 5), *(c1 + 6), *(c1 + 7), *c2, *(c2 + 1), *(c2 + 2), *(c2 + 3), *(c2 + 4), *(c2 + 5), *(c2 + 6), *(c2 + 7)); */
if ((p1 != -1) && (p1 < 52) && ((p1 < p2) || (p2 == -1)))
- G3d_truncDouble(&xdrd2, p1);
+ Rast3d_truncDouble(&xdrd2, p1);
if ((p2 != -1) && (p2 < 52) && ((p2 < p1) || (p1 == -1)))
- G3d_truncDouble(&xdrd1, p2);
+ Rast3d_truncDouble(&xdrd1, p2);
/* printf ("%d %d (%d %d %d %d %d %d %d %d) (%d %d %d %d %d %d %d %d)\n", p1, p2, *c1, *(c1 + 1), *(c1 + 2), *(c1 + 3), *(c1 + 4), *(c1 + 5), *(c1 + 6), *(c1 + 7), *c2, *(c2 + 1), *(c2 + 2), *(c2 + 3), *(c2 + 4), *(c2 + 5), *(c2 + 6), *(c2 + 7)); */
@@ -255,14 +255,14 @@
/*---------------------------------------------------------------------------*/
-static int G3d_compareFloatDouble(float *f, int p1, double *d, int p2)
+static int Rast3d_compareFloatDouble(float *f, int p1, double *d, int p2)
{
unsigned char *c1, *c2;
float xdrf, fTmp;
double xdrd, xdrd2, dTmp;
- if (G3d_isNullValueNum(f, FCELL_TYPE))
- return G3d_isNullValueNum(d, DCELL_TYPE);
+ if (Rast3d_isNullValueNum(f, FCELL_TYPE))
+ return Rast3d_isNullValueNum(d, DCELL_TYPE);
/* need this since assigning a double to a float actually may change the */
/* bit pattern. an example (in xdr format) is the double */
@@ -272,9 +272,9 @@
fTmp = *d;
dTmp = fTmp;
- G3d_float2xdrFloat(f, &xdrf);
- G3d_float2Double(&xdrf, &xdrd2);
- G3d_double2xdrDouble(&dTmp, &xdrd);
+ Rast3d_float2xdrFloat(f, &xdrf);
+ Rast3d_float2Double(&xdrf, &xdrd2);
+ Rast3d_double2xdrDouble(&dTmp, &xdrd);
c1 = (unsigned char *)&xdrd2;
c2 = (unsigned char *)&xdrd;
@@ -284,9 +284,9 @@
if (((p1 != -1) && ((p1 < p2) || (p2 == -1))) ||
((p1 == -1) && ((p2 > 23) || (p2 == -1))))
- G3d_truncDouble(&xdrd, (p1 != -1 ? p1 : 23));
+ Rast3d_truncDouble(&xdrd, (p1 != -1 ? p1 : 23));
if ((p2 != -1) && (p2 < 23) && ((p2 < p1) || (p1 == -1)))
- G3d_truncDouble(&xdrd2, p2);
+ Rast3d_truncDouble(&xdrd2, p2);
/* printf ("%d %d (%d %d %d %d) (%d %d %d %d %d %d %d %d) (%d %d %d %d %d %d %d %d)\n", p1, p2, *((unsigned char *) &xdrf), *(((unsigned char *) &xdrf) + 1), *(((unsigned char *) &xdrf) + 2), *(((unsigned char *) &xdrf) + 3), *c1, *(c1 + 1), *(c1 + 2), *(c1 + 3), *(c1 + 4), *(c1 + 5), *(c1 + 6), *(c1 + 7), *c2, *(c2 + 1), *(c2 + 2), *(c2 + 3), *(c2 + 4), *(c2 + 5), *(c2 + 6), *(c2 + 7)); */
@@ -309,13 +309,13 @@
int tileX, tileY, tileZ, typeIntern, typeIntern2;
int nx, ny, nz;
- p1 = G3d_tilePrecisionMap(map);
- p2 = G3d_tilePrecisionMap(map2);
+ p1 = Rast3d_tilePrecisionMap(map);
+ p2 = Rast3d_tilePrecisionMap(map2);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_getNofTilesMap(map2, &nx, &ny, &nz);
- typeIntern = G3d_tileTypeMap(map);
- typeIntern2 = G3d_tileTypeMap(map2);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_getNofTilesMap(map2, &nx, &ny, &nz);
+ typeIntern = Rast3d_tileTypeMap(map);
+ typeIntern2 = Rast3d_tileTypeMap(map2);
n1p = &n1;
f1p = (float *)&n1;
@@ -328,31 +328,31 @@
for (y = 0; y < ny * tileY; y++) {
for (x = 0; x < nx * tileX; x++) {
- G3d_getBlock(map, x, y, z, 1, 1, 1, n1p, typeIntern);
- G3d_getBlock(map2, x, y, z, 1, 1, 1, n2p, typeIntern2);
+ Rast3d_getBlock(map, x, y, z, 1, 1, 1, n1p, typeIntern);
+ Rast3d_getBlock(map2, x, y, z, 1, 1, 1, n2p, typeIntern2);
if (typeIntern == FCELL_TYPE) {
if (typeIntern2 == FCELL_TYPE)
- correct = G3d_compareFloats(f1p, p1, f2p, p2);
+ correct = Rast3d_compareFloats(f1p, p1, f2p, p2);
else
- correct = G3d_compareFloatDouble(f1p, p1, n2p, p2);
+ correct = Rast3d_compareFloatDouble(f1p, p1, n2p, p2);
}
else {
if (typeIntern2 == FCELL_TYPE)
- correct = G3d_compareFloatDouble(f2p, p2, n1p, p1);
+ correct = Rast3d_compareFloatDouble(f2p, p2, n1p, p1);
else
- correct = G3d_compareDoubles(n1p, p1, n2p, p2);
+ correct = Rast3d_compareDoubles(n1p, p1, n2p, p2);
}
if (!correct) {
int xTile, yTile, zTile, xOffs, yOffs, zOffs;
- G3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
+ Rast3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
&xOffs, &yOffs, &zOffs);
printf("(%d %d %d) (%d %d %d) (%d %d %d) %.20f %.20f\n",
x, y, z, xTile, yTile, zTile, xOffs, yOffs, zOffs,
*n1p, *n2p);
- G3d_fatalError
+ Rast3d_fatalError
("compareFilesNocache: files don't match\n");
}
}
@@ -383,7 +383,7 @@
*/
void
-G3d_compareFiles(const char *f1, const char *mapset1, const char *f2,
+Rast3d_compareFiles(const char *f1, const char *mapset1, const char *f2,
const char *mapset2)
{
void *map, *map2;
@@ -398,35 +398,35 @@
printf("\nComparing %s and %s\n", f1, f2);
- map = G3d_openCellOld(f1, mapset1, RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(f1, mapset1, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError("G3d_compareFiles: error in G3d_openCellOld");
+ Rast3d_fatalError("Rast3d_compareFiles: error in Rast3d_openCellOld");
- G3d_printHeader(map);
+ Rast3d_printHeader(map);
- map2 = G3d_openCellOld(f2, mapset2, RASTER3D_DEFAULT_WINDOW,
+ map2 = Rast3d_openCellOld(f2, mapset2, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map2 == NULL)
- G3d_fatalError("G3d_compareFiles: error in G3d_openCellOld");
+ Rast3d_fatalError("Rast3d_compareFiles: error in Rast3d_openCellOld");
- G3d_printHeader(map2);
+ Rast3d_printHeader(map2);
- typeIntern = G3d_tileTypeMap(map);
- typeIntern2 = G3d_tileTypeMap(map2);
+ typeIntern = Rast3d_tileTypeMap(map);
+ typeIntern2 = Rast3d_tileTypeMap(map2);
- p1 = G3d_tilePrecisionMap(map);
- p2 = G3d_tilePrecisionMap(map2);
+ p1 = Rast3d_tilePrecisionMap(map);
+ p2 = Rast3d_tilePrecisionMap(map2);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_getTileDimensionsMap(map2, &tileX2, &tileY2, &tileZ2);
- G3d_getNofTilesMap(map2, &nx, &ny, &nz);
- G3d_getCoordsMap(map, &rows, &cols, &depths);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_getTileDimensionsMap(map2, &tileX2, &tileY2, &tileZ2);
+ Rast3d_getNofTilesMap(map2, &nx, &ny, &nz);
+ Rast3d_getCoordsMap(map, &rows, &cols, &depths);
- if ((!G3d_tileUseCacheMap(map)) || (!G3d_tileUseCacheMap(map2))) {
+ if ((!Rast3d_tileUseCacheMap(map)) || (!Rast3d_tileUseCacheMap(map2))) {
compareFilesNocache(map, map2);
- G3d_closeCell(map);
- G3d_closeCell(map2);
+ Rast3d_closeCell(map);
+ Rast3d_closeCell(map2);
return;
}
@@ -435,59 +435,59 @@
n2p = &n2;
f2p = (float *)&n2;
- G3d_autolockOn(map);
- G3d_autolockOn(map2);
- G3d_minUnlocked(map, cols / tileX + 1);
+ Rast3d_autolockOn(map);
+ Rast3d_autolockOn(map2);
+ Rast3d_minUnlocked(map, cols / tileX + 1);
- G3d_getCoordsMap(map2, &rows, &cols, &depths);
- G3d_minUnlocked(map2, cols / tileX + 1);
+ Rast3d_getCoordsMap(map2, &rows, &cols, &depths);
+ Rast3d_minUnlocked(map2, cols / tileX + 1);
- G3d_getCoordsMap(map, &rows, &cols, &depths);
+ Rast3d_getCoordsMap(map, &rows, &cols, &depths);
for (z = 0; z < depths; z++) {
printf("comparing: z = %d\n", z);
if ((z % tileZ) == 0) {
- if (!G3d_unlockAll(map))
- G3d_fatalError("G3d_compareFiles: error in G3d_unlockAll");
+ if (!Rast3d_unlockAll(map))
+ Rast3d_fatalError("Rast3d_compareFiles: error in Rast3d_unlockAll");
}
if ((z % tileZ2) == 0) {
- if (!G3d_unlockAll(map2))
- G3d_fatalError("G3d_compareFiles: error in G3d_unlockAll");
+ if (!Rast3d_unlockAll(map2))
+ Rast3d_fatalError("Rast3d_compareFiles: error in Rast3d_unlockAll");
}
for (y = 0; y < rows; y++) {
for (x = 0; x < cols; x++) {
- G3d_getValueRegion(map, x, y, z, n1p, typeIntern);
- G3d_getValueRegion(map2, x, y, z, n2p, typeIntern2);
+ Rast3d_getValueRegion(map, x, y, z, n1p, typeIntern);
+ Rast3d_getValueRegion(map2, x, y, z, n2p, typeIntern2);
- G3d_isNullValueNum(n1p, typeIntern);
- G3d_isNullValueNum(n2p, typeIntern2);
+ Rast3d_isNullValueNum(n1p, typeIntern);
+ Rast3d_isNullValueNum(n2p, typeIntern2);
if (typeIntern == FCELL_TYPE) {
if (typeIntern2 == FCELL_TYPE)
- correct = G3d_compareFloats(f1p, p1, f2p, p2);
+ correct = Rast3d_compareFloats(f1p, p1, f2p, p2);
else
- correct = G3d_compareFloatDouble(f1p, p1, n2p, p2);
+ correct = Rast3d_compareFloatDouble(f1p, p1, n2p, p2);
}
else {
if (typeIntern2 == FCELL_TYPE)
- correct = G3d_compareFloatDouble(f2p, p2, n1p, p1);
+ correct = Rast3d_compareFloatDouble(f2p, p2, n1p, p1);
else
- correct = G3d_compareDoubles(n1p, p1, n2p, p2);
+ correct = Rast3d_compareDoubles(n1p, p1, n2p, p2);
}
if (!correct) {
int xTile, yTile, zTile, xOffs, yOffs, zOffs;
- G3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
+ Rast3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
&xOffs, &yOffs, &zOffs);
- G3d_fatalError("G3d_compareFiles: files don't match\n");
+ Rast3d_fatalError("Rast3d_compareFiles: files don't match\n");
}
}
}
}
printf("Files are identical up to precision.\n");
- G3d_closeCell(map);
- G3d_closeCell(map2);
+ Rast3d_closeCell(map);
+ Rast3d_closeCell(map2);
}
Modified: grass/trunk/lib/raster3d/filename.c
===================================================================
--- grass/trunk/lib/raster3d/filename.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/filename.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -7,7 +7,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_filename(char *path, const char *elementName, const char *mapName,
+Rast3d_filename(char *path, const char *elementName, const char *mapName,
const char *mapset)
{
G_file_name_misc(path, RASTER3D_DIRECTORY, elementName, mapName, mapset);
Modified: grass/trunk/lib/raster3d/fpcompress.c
===================================================================
--- grass/trunk/lib/raster3d/fpcompress.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/fpcompress.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -100,7 +100,7 @@
f = (float *)src;
nofNull = 0;
while (srcStop != (unsigned char *)f)
- nofNull += G3d_isXdrNullFloat(f++);
+ nofNull += Rast3d_isXdrNullFloat(f++);
if (nofNull == size) {
*dst = (unsigned char)ALL_NULL_CODE;
@@ -135,7 +135,7 @@
while (srcStop != src) {
if (nofNull) {
- isNull = G3d_isXdrNullFloat((float *)src);
+ isNull = Rast3d_isXdrNullFloat((float *)src);
if (nNullBits) {
*nullBits |= ((unsigned char)isNull << nNullBits++);
@@ -258,7 +258,7 @@
d = (double *)src;
nofNull = 0;
while (srcStop != (unsigned char *)d)
- nofNull += G3d_isXdrNullDouble(d++);
+ nofNull += Rast3d_isXdrNullDouble(d++);
if (nofNull == size) {
*dst = (unsigned char)ALL_NULL_CODE;
@@ -300,7 +300,7 @@
while (srcStop != src) {
if (nofNull) {
- isNull = G3d_isXdrNullDouble((double *)src);
+ isNull = Rast3d_isXdrNullDouble((double *)src);
if (nNullBits) {
*nullBits |= ((unsigned char)isNull << nNullBits++);
@@ -435,7 +435,7 @@
if (*src == (unsigned char)ALL_NULL_CODE) {
f = (float *)dst;
while (dstStop != (unsigned char *)f)
- G3d_setXdrNullFloat(f++);
+ Rast3d_setXdrNullFloat(f++);
return;
}
@@ -485,7 +485,7 @@
}
if (isNull) {
- G3d_setXdrNullFloat((float *)dst);
+ Rast3d_setXdrNullFloat((float *)dst);
dst += XDR_FLOAT_LENGTH;
continue;
}
@@ -577,7 +577,7 @@
/*printf ("all null\n"); */
d = (double *)dst;
while (dstStop != (unsigned char *)d)
- G3d_setXdrNullDouble(d++);
+ Rast3d_setXdrNullDouble(d++);
return;
}
@@ -637,7 +637,7 @@
}
if (isNull) {
- G3d_setXdrNullDouble((double *)dst);
+ Rast3d_setXdrNullDouble((double *)dst);
dst += XDR_DOUBLE_LENGTH;
continue;
}
@@ -782,7 +782,7 @@
}
if (status < 0) {
- G3d_error("G_fpcompress_writeXdrNums: write error");
+ Rast3d_error("G_fpcompress_writeXdrNums: write error");
return 0;
}
@@ -797,7 +797,7 @@
{
if (!G_fpcompress_writeXdrNums(fd, src, nofNum, precision, compressBuf, 1,
useRle, useLzw)) {
- G3d_error
+ Rast3d_error
("G_fpcompress_writeXdrFloats: error in G_fpcompress_writeXdrNums");
return 0;
}
@@ -813,7 +813,7 @@
{
if (!G_fpcompress_writeXdrNums(fd, src, nofNum, precision, compressBuf, 0,
useRle, useLzw)) {
- G3d_error
+ Rast3d_error
("G_fpcompress_writeXdrDouble: error in G_fpcompress_writeXdrNums");
return 0;
}
@@ -840,7 +840,7 @@
nofNum * nBytes + 1);
#endif
if (status < 0) {
- G3d_error("G_fpcompress_readXdrNums: read error");
+ Rast3d_error("G_fpcompress_readXdrNums: read error");
return 0;
}
@@ -849,7 +849,7 @@
G_rle_decode(compressBuf, dst, nofNum * nBytes, 1,
&lengthEncode, &lengthDecode);
if (*dst == ALL_NULL_CODE)
- G3d_fatalError("G_fpcompress_readXdrNums: wrong code");
+ Rast3d_fatalError("G_fpcompress_readXdrNums: wrong code");
if (status == nofNum * nBytes)
status -= lengthDecode - lengthEncode;
@@ -885,7 +885,7 @@
{
if (!G_fpcompress_readXdrNums(fd, dst, nofNum, fileBytes, precision,
compressBuf, 1)) {
- G3d_error
+ Rast3d_error
("G_fpcompress_readXdrFloats: error in G_fpcompress_readXdrNums");
return 0;
}
@@ -901,7 +901,7 @@
{
if (!G_fpcompress_readXdrNums(fd, dst, nofNum, fileBytes, precision,
compressBuf, 0)) {
- G3d_error
+ Rast3d_error
("G_fpcompress_readXdrDouble: error in G_fpcompress_readXdrNums");
return 0;
}
Modified: grass/trunk/lib/raster3d/fpxdr.c
===================================================================
--- grass/trunk/lib/raster3d/fpxdr.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/fpxdr.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,7 +12,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_isXdrNullNum(const void *num, int isFloat)
+int Rast3d_isXdrNullNum(const void *num, int isFloat)
{
static const char null_bytes[8] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
@@ -23,21 +23,21 @@
/*---------------------------------------------------------------------------*/
-int G3d_isXdrNullFloat(const float *f)
+int Rast3d_isXdrNullFloat(const float *f)
{
- return G3d_isXdrNullNum(f, 1);
+ return Rast3d_isXdrNullNum(f, 1);
}
/*---------------------------------------------------------------------------*/
-int G3d_isXdrNullDouble(const double *d)
+int Rast3d_isXdrNullDouble(const double *d)
{
- return G3d_isXdrNullNum(d, 0);
+ return Rast3d_isXdrNullNum(d, 0);
}
/*---------------------------------------------------------------------------*/
-void G3d_setXdrNullNum(void *num, int isFloat)
+void Rast3d_setXdrNullNum(void *num, int isFloat)
{
static const char null_bytes[8] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
@@ -48,23 +48,23 @@
/*---------------------------------------------------------------------------*/
-void G3d_setXdrNullDouble(double *d)
+void Rast3d_setXdrNullDouble(double *d)
{
- G3d_setXdrNullNum(d, 0);
+ Rast3d_setXdrNullNum(d, 0);
}
/*---------------------------------------------------------------------------*/
-void G3d_setXdrNullFloat(float *f)
+void Rast3d_setXdrNullFloat(float *f)
{
- G3d_setXdrNullNum(f, 1);
+ Rast3d_setXdrNullNum(f, 1);
}
/*---------------------------------------------------------------------------*/
XDR xdrEncodeStream, xdrDecodeStream; /* xdr support structures */
-int G3d_initFpXdr(RASTER3D_Map * map, int misuseBytes)
+int Rast3d_initFpXdr(RASTER3D_Map * map, int misuseBytes)
@@ -79,9 +79,9 @@
xdrLength = map->tileSize * RASTER3D_MAX(map->numLengthExtern,
map->numLengthIntern) +
misuseBytes;
- xdr = G3d_malloc(xdrLength);
+ xdr = Rast3d_malloc(xdrLength);
if (xdr == NULL) {
- G3d_error("G3d_initFpXdr: error in G3d_malloc");
+ Rast3d_error("Rast3d_initFpXdr: error in Rast3d_malloc");
return 0;
}
@@ -93,9 +93,9 @@
xdrLength = map->tileSize * RASTER3D_MAX(map->numLengthExtern,
map->numLengthIntern) +
misuseBytes;
- xdr = G3d_realloc(xdr, xdrLength);
+ xdr = Rast3d_realloc(xdr, xdrLength);
if (xdr == NULL) {
- G3d_error("G3d_initFpXdr: error in G3d_realloc");
+ Rast3d_error("Rast3d_initFpXdr: error in Rast3d_realloc");
return 0;
}
@@ -118,7 +118,7 @@
static XDR *xdrs;
static double tmpValue, *tmp;
-int G3d_initCopyToXdr(RASTER3D_Map * map, int sType)
+int Rast3d_initCopyToXdr(RASTER3D_Map * map, int sType)
{
xdrTmp = xdr;
useXdr = map->useXdr;
@@ -126,7 +126,7 @@
if (map->useXdr == RASTER3D_USE_XDR) {
if (!xdr_setpos(&(xdrEncodeStream), 0)) {
- G3d_error("G3d_InitCopyToXdr: positioning xdr failed");
+ Rast3d_error("Rast3d_InitCopyToXdr: positioning xdr failed");
return 0;
}
xdrs = &(xdrEncodeStream);
@@ -134,8 +134,8 @@
type = map->type;
isFloat = (type == FCELL_TYPE);
- externLength = G3d_externLength(type);
- eltLength = G3d_length(srcType);
+ externLength = Rast3d_externLength(type);
+ eltLength = Rast3d_length(srcType);
if (isFloat)
xdrFun = xdr_float;
else
@@ -147,29 +147,29 @@
/*---------------------------------------------------------------------------*/
-int G3d_copyToXdr(const void *src, int nofNum)
+int Rast3d_copyToXdr(const void *src, int nofNum)
{
int i;
if (useXdr == RASTER3D_NO_XDR) {
- G3d_copyValues(src, 0, srcType, xdrTmp, 0, type, nofNum);
- xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * G3d_externLength(type));
+ Rast3d_copyValues(src, 0, srcType, xdrTmp, 0, type, nofNum);
+ xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * Rast3d_externLength(type));
return 1;
}
for (i = 0; i < nofNum; i++, src = G_incr_void_ptr(src, eltLength)) {
- if (G3d_isNullValueNum(src, srcType)) {
- G3d_setXdrNullNum(xdrTmp, isFloat);
+ if (Rast3d_isNullValueNum(src, srcType)) {
+ Rast3d_setXdrNullNum(xdrTmp, isFloat);
if (!xdr_setpos(xdrs, xdr_getpos(xdrs) + externLength)) {
- G3d_error("G3d_copyToXdr: positioning xdr failed");
+ Rast3d_error("Rast3d_copyToXdr: positioning xdr failed");
return 0;
}
}
else {
if (type == srcType) {
if (xdrFun(xdrs, src) < 0) {
- G3d_error("G3d_copyToXdr: writing xdr failed");
+ Rast3d_error("Rast3d_copyToXdr: writing xdr failed");
return 0;
}
}
@@ -179,7 +179,7 @@
else
*((double *)tmp) = (double)*((float *)src);
if (xdrFun(xdrs, tmp) < 0) {
- G3d_error("G3d_copyToXdr: writing xdr failed");
+ Rast3d_error("Rast3d_copyToXdr: writing xdr failed");
return 0;
}
}
@@ -193,7 +193,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_initCopyFromXdr(RASTER3D_Map * map, int dType)
+int Rast3d_initCopyFromXdr(RASTER3D_Map * map, int dType)
{
xdrTmp = xdr;
useXdr = map->useXdr;
@@ -201,7 +201,7 @@
if (useXdr == RASTER3D_USE_XDR) {
if (!xdr_setpos(&(xdrDecodeStream), 0)) {
- G3d_error("G3d_initCopyFromXdr: positioning xdr failed");
+ Rast3d_error("Rast3d_initCopyFromXdr: positioning xdr failed");
return 0;
}
xdrs = &(xdrDecodeStream);
@@ -209,8 +209,8 @@
type = map->type;
isFloat = (type == FCELL_TYPE);
- externLength = G3d_externLength(type);
- eltLength = G3d_length(dstType);
+ externLength = Rast3d_externLength(type);
+ eltLength = Rast3d_length(dstType);
if (isFloat)
xdrFun = xdr_float;
else
@@ -222,35 +222,35 @@
/*---------------------------------------------------------------------------*/
-int G3d_copyFromXdr(int nofNum, void *dst)
+int Rast3d_copyFromXdr(int nofNum, void *dst)
{
int i;
if (useXdr == RASTER3D_NO_XDR) {
- G3d_copyValues(xdrTmp, 0, type, dst, 0, dstType, nofNum);
- xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * G3d_externLength(type));
+ Rast3d_copyValues(xdrTmp, 0, type, dst, 0, dstType, nofNum);
+ xdrTmp = G_incr_void_ptr(xdrTmp, nofNum * Rast3d_externLength(type));
return 1;
}
for (i = 0; i < nofNum; i++, dst = G_incr_void_ptr(dst, eltLength)) {
- if (G3d_isXdrNullNum(xdrTmp, isFloat)) {
- G3d_setNullValue(dst, 1, dstType);
+ if (Rast3d_isXdrNullNum(xdrTmp, isFloat)) {
+ Rast3d_setNullValue(dst, 1, dstType);
if (!xdr_setpos(xdrs, xdr_getpos(xdrs) + externLength)) {
- G3d_error("G3d_copyFromXdr: positioning xdr failed");
+ Rast3d_error("Rast3d_copyFromXdr: positioning xdr failed");
return 0;
}
}
else {
if (type == dstType) {
if (xdrFun(xdrs, dst) < 0) {
- G3d_error("G3d_copyFromXdr: reading xdr failed");
+ Rast3d_error("Rast3d_copyFromXdr: reading xdr failed");
return 0;
}
}
else {
if (xdrFun(xdrs, tmp) < 0) {
- G3d_error("G3d_copyFromXdr: reading xdr failed");
+ Rast3d_error("Rast3d_copyFromXdr: reading xdr failed");
return 0;
}
if (type == FCELL_TYPE)
Modified: grass/trunk/lib/raster3d/getblock.c
===================================================================
--- grass/trunk/lib/raster3d/getblock.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/getblock.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -9,7 +9,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_getBlockNocache(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny,
+Rast3d_getBlockNocache(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny,
int nz, void *block, int type)
{
void *tile;
@@ -19,13 +19,13 @@
int tileIndex;
if (!map->useCache)
- tile = G3d_allocTilesType(map, 1, type);
+ tile = Rast3d_allocTilesType(map, 1, type);
if (tile == NULL)
- G3d_fatalError("G3d_getBlockNocache: error in G3d_allocTiles");
+ Rast3d_fatalError("Rast3d_getBlockNocache: error in Rast3d_allocTiles");
- G3d_coord2tileCoord(map, x0, y0, z0, &tileX0, &tileY0, &tileZ0,
+ Rast3d_coord2tileCoord(map, x0, y0, z0, &tileX0, &tileY0, &tileZ0,
&tileOffsX0, &tileOffsY0, &tileOffsZ0);
- G3d_coord2tileCoord(map, x0 + nx - 1, y0 + ny - 1, z0 + nz - 1,
+ Rast3d_coord2tileCoord(map, x0 + nx - 1, y0 + ny - 1, z0 + nz - 1,
&tileX1, &tileY1, &tileZ1,
&tileOffsX1, &tileOffsY1, &tileOffsZ1);
@@ -36,24 +36,24 @@
for (tx = tileX0; tx <= tileX1; tx++) {
dx = (tx - tileX0) * map->tileX - tileOffsX0;
- tileIndex = G3d_tile2tileIndex(map, tx, ty, tz);
+ tileIndex = Rast3d_tile2tileIndex(map, tx, ty, tz);
- if (G3d_tileIndexInRange(map, tileIndex))
+ if (Rast3d_tileIndexInRange(map, tileIndex))
if (map->useCache) {
- tile = G3d_getTilePtr(map, tileIndex);
+ tile = Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL)
- G3d_fatalError
- ("G3d_getBlockNocache: error in G3d_getTilePtr");
+ Rast3d_fatalError
+ ("Rast3d_getBlockNocache: error in Rast3d_getTilePtr");
}
else {
- if (!G3d_readTile
+ if (!Rast3d_readTile
(map, tileIndex, tile, map->typeIntern))
- G3d_fatalError
- ("G3d_getBlockNocache: error in G3d_readTile");
+ Rast3d_fatalError
+ ("Rast3d_getBlockNocache: error in Rast3d_readTile");
}
else
- G3d_setNullTile(map, tile);
+ Rast3d_setNullTile(map, tile);
cols = (tx == tileX1 ? tileOffsX1 : map->tileX - 1);
rows = (ty == tileY1 ? tileOffsY1 : map->tileY - 1);
@@ -63,7 +63,7 @@
for (z = (tz == tileZ0 ? tileOffsZ0 : 0); z <= depths; z++)
for (y = (ty == tileY0 ? tileOffsY0 : 0); y <= rows; y++) {
- G3d_copyValues(tile,
+ Rast3d_copyValues(tile,
z * map->tileXY + y * map->tileX + x,
map->typeIntern,
block,
@@ -75,7 +75,7 @@
}
if (!map->useCache)
- G3d_freeTiles(tile);
+ Rast3d_freeTiles(tile);
}
/*---------------------------------------------------------------------------*/
@@ -102,13 +102,13 @@
*/
void
-G3d_getBlock(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny, int nz,
+Rast3d_getBlock(RASTER3D_Map * map, int x0, int y0, int z0, int nx, int ny, int nz,
void *block, int type)
{
int x, y, z, nNull, x1, y1, z1, length;
if (!map->useCache) {
- G3d_getBlockNocache(map, x0, y0, z0, nx, ny, nz, block, type);
+ Rast3d_getBlockNocache(map, x0, y0, z0, nx, ny, nz, block, type);
return;
}
@@ -116,22 +116,22 @@
y1 = RASTER3D_MIN(y0 + ny, map->region.rows);
z1 = RASTER3D_MIN(z0 + nz, map->region.depths);
- length = G3d_length(type);
+ length = Rast3d_length(type);
for (z = z0; z < z1; z++) {
for (y = y0; y < y1; y++) {
for (x = x0; x < x1; x++) {
- G3d_getValueRegion(map, x, y, z, block, type);
+ Rast3d_getValueRegion(map, x, y, z, block, type);
block = G_incr_void_ptr(block, length);
}
nNull = x0 + nx - x;
- G3d_setNullValue(block, nNull, type);
+ Rast3d_setNullValue(block, nNull, type);
block = G_incr_void_ptr(block, length * nNull);
}
nNull = (y0 + ny - y) * nx;
- G3d_setNullValue(block, nNull, type);
+ Rast3d_setNullValue(block, nNull, type);
block = G_incr_void_ptr(block, length * nNull);
}
nNull = (z0 + nz - z) * ny * nx;
- G3d_setNullValue(block, nNull, type);
+ Rast3d_setNullValue(block, nNull, type);
}
Modified: grass/trunk/lib/raster3d/getvalue.c
===================================================================
--- grass/trunk/lib/raster3d/getvalue.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/getvalue.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -19,7 +19,7 @@
* \return void
*/
-void G3d_getValue(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
+void Rast3d_getValue(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
{
/* get the resampled value */
map->resampleFun(map, x, y, z, value, type);
@@ -31,7 +31,7 @@
* \brief
*
* Is equivalent to
- * <tt>G3d_getValue (map, x, y, z, &value, FCELL_TYPE);</tt> return value.
+ * <tt>Rast3d_getValue (map, x, y, z, &value, FCELL_TYPE);</tt> return value.
*
* \param map
* \param x
@@ -40,11 +40,11 @@
* \return float
*/
-float G3d_getFloat(RASTER3D_Map * map, int x, int y, int z)
+float Rast3d_getFloat(RASTER3D_Map * map, int x, int y, int z)
{
float value;
- G3d_getValue(map, x, y, z, &value, FCELL_TYPE);
+ Rast3d_getValue(map, x, y, z, &value, FCELL_TYPE);
return value;
}
@@ -54,7 +54,7 @@
* \brief
*
* Is equivalent
- * to <tt>G3d_getValue (map, x, y, z, &value, DCELL_TYPE);</tt> return value.
+ * to <tt>Rast3d_getValue (map, x, y, z, &value, DCELL_TYPE);</tt> return value.
*
* \param map
* \param x
@@ -63,11 +63,11 @@
* \return double
*/
-double G3d_getDouble(RASTER3D_Map * map, int x, int y, int z)
+double Rast3d_getDouble(RASTER3D_Map * map, int x, int y, int z)
{
double value;
- G3d_getValue(map, x, y, z, &value, DCELL_TYPE);
+ Rast3d_getValue(map, x, y, z, &value, DCELL_TYPE);
return value;
}
@@ -91,18 +91,18 @@
*/
void
-G3d_getWindowValue(RASTER3D_Map * map, double north, double east, double top,
+Rast3d_getWindowValue(RASTER3D_Map * map, double north, double east, double top,
void *value, int type)
{
int col, row, depth;
- G3d_location2coord(&(map->window), north, east, top, &col, &row, &depth);
+ Rast3d_location2coord(&(map->window), north, east, top, &col, &row, &depth);
/* if (row, col, depth) outside window return NULL value */
if ((row < 0) || (row >= map->window.rows) ||
(col < 0) || (col >= map->window.cols) ||
(depth < 0) || (depth >= map->window.depths)) {
- G3d_setNullValue(value, 1, type);
+ Rast3d_setNullValue(value, 1, type);
return;
}
@@ -128,23 +128,23 @@
*/
void
-G3d_getRegionValue(RASTER3D_Map * map, double north, double east, double top,
+Rast3d_getRegionValue(RASTER3D_Map * map, double north, double east, double top,
void *value, int type)
{
int row, col, depth;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
/* if (row, col, depth) outside region return NULL value */
if ((row < 0) || (row >= map->region.rows) ||
(col < 0) || (col >= map->region.cols) ||
(depth < 0) || (depth >= map->region.depths)) {
- G3d_setNullValue(value, 1, type);
+ Rast3d_setNullValue(value, 1, type);
return;
}
/* Get the value from the map in map-region resolution */
- G3d_getValueRegion(map, col, row, depth, value, type);
+ Rast3d_getValueRegion(map, col, row, depth, value, type);
}
/*---------------------------------------------------------------------------*/
@@ -152,7 +152,7 @@
/*!
* \brief
*
- * Is equivalent to <tt>G3d_getValueRegion (map, x, y, z, &value, FCELL_TYPE);</tt>
+ * Is equivalent to <tt>Rast3d_getValueRegion (map, x, y, z, &value, FCELL_TYPE);</tt>
* return value.
*
* \param map
@@ -162,19 +162,19 @@
* \return float
*/
-float G3d_getFloatRegion(RASTER3D_Map * map, int x, int y, int z)
+float Rast3d_getFloatRegion(RASTER3D_Map * map, int x, int y, int z)
{
int tileIndex, offs;
float *tile;
if (map->typeIntern == DCELL_TYPE)
- return (float)G3d_getDoubleRegion(map, x, y, z);
+ return (float)Rast3d_getDoubleRegion(map, x, y, z);
- G3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
- tile = (float *)G3d_getTilePtr(map, tileIndex);
+ Rast3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
+ tile = (float *)Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL)
- G3d_fatalError("G3d_getFloatRegion: error in G3d_getTilePtr");
+ Rast3d_fatalError("Rast3d_getFloatRegion: error in Rast3d_getTilePtr");
return tile[offs];
}
@@ -185,7 +185,7 @@
/*!
* \brief
*
- * Is equivalent to <tt>G3d_getValueRegion (map, x, y, z, &value,
+ * Is equivalent to <tt>Rast3d_getValueRegion (map, x, y, z, &value,
* DCELL_TYPE);</tt> return value.
*
* \param map
@@ -195,19 +195,19 @@
* \return double
*/
-double G3d_getDoubleRegion(RASTER3D_Map * map, int x, int y, int z)
+double Rast3d_getDoubleRegion(RASTER3D_Map * map, int x, int y, int z)
{
int tileIndex, offs;
double *tile;
if (map->typeIntern == FCELL_TYPE)
- return (double)G3d_getFloatRegion(map, x, y, z);
+ return (double)Rast3d_getFloatRegion(map, x, y, z);
- G3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
- tile = (double *)G3d_getTilePtr(map, tileIndex);
+ Rast3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
+ tile = (double *)Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL)
- G3d_fatalError("G3d_getDoubleRegion: error in G3d_getTilePtr");
+ Rast3d_fatalError("Rast3d_getDoubleRegion: error in Rast3d_getTilePtr");
return tile[offs];
}
@@ -234,12 +234,12 @@
*/
void
-G3d_getValueRegion(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
+Rast3d_getValueRegion(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
{
if (type == FCELL_TYPE) {
- *((float *)value) = G3d_getFloatRegion(map, x, y, z);
+ *((float *)value) = Rast3d_getFloatRegion(map, x, y, z);
return;
}
- *((double *)value) = G3d_getDoubleRegion(map, x, y, z);
+ *((double *)value) = Rast3d_getDoubleRegion(map, x, y, z);
}
Modified: grass/trunk/lib/raster3d/header.c
===================================================================
--- grass/trunk/lib/raster3d/header.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/header.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32,7 +32,7 @@
/*---------------------------------------------------------------------------*/
static int
-G3d_readWriteHeader(struct Key_Value *headerKeys, int doRead, int *proj,
+Rast3d_readWriteHeader(struct Key_Value *headerKeys, int doRead, int *proj,
int *zone, double *north, double *south, double *east,
double *west, double *top, double *bottom, int *rows,
int *cols, int *depths, double *ew_res, double *ns_res,
@@ -46,16 +46,16 @@
int (*headerString) ();
if (doRead) {
- headerDouble = G3d_keyGetDouble;
- headerInt = G3d_keyGetInt;
- headerString = G3d_keyGetString;
- headerValue = G3d_keyGetValue;
+ headerDouble = Rast3d_keyGetDouble;
+ headerInt = Rast3d_keyGetInt;
+ headerString = Rast3d_keyGetString;
+ headerValue = Rast3d_keyGetValue;
}
else {
- headerDouble = G3d_keySetDouble;
- headerInt = G3d_keySetInt;
- headerString = G3d_keySetString;
- headerValue = G3d_keySetValue;
+ headerDouble = Rast3d_keySetDouble;
+ headerInt = Rast3d_keySetInt;
+ headerString = Rast3d_keySetString;
+ headerValue = Rast3d_keySetValue;
}
returnVal = 1;
@@ -102,14 +102,14 @@
if (returnVal)
return 1;
- G3d_error("G3d_readWriteHeader: error writing header");
+ Rast3d_error("Rast3d_readWriteHeader: error writing header");
return 0;
}
/*---------------------------------------------------------------------------*/
int
-G3d_readHeader(RASTER3D_Map * map, int *proj, int *zone, double *north,
+Rast3d_readHeader(RASTER3D_Map * map, int *proj, int *zone, double *north,
double *south, double *east, double *west, double *top,
double *bottom, int *rows, int *cols, int *depths,
double *ew_res, double *ns_res, double *tb_res, int *tileX,
@@ -120,15 +120,15 @@
struct Key_Value *headerKeys;
char path[GPATH_MAX];
- G3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
+ Rast3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
if (access(path, R_OK) != 0) {
- G3d_error("G3d_readHeader: unable to find [%s]", path);
+ Rast3d_error("Rast3d_readHeader: unable to find [%s]", path);
return 0;
}
headerKeys = G_read_key_value_file(path);
- if (!G3d_readWriteHeader(headerKeys, 1,
+ if (!Rast3d_readWriteHeader(headerKeys, 1,
proj, zone,
north, south, east, west, top, bottom,
rows, cols, depths,
@@ -136,7 +136,7 @@
tileX, tileY, tileZ,
type, compression, useRle, useLzw, precision,
dataOffset, useXdr, hasIndex, unit)) {
- G3d_error("G3d_readHeader: error extracting header key(s) of file %s",
+ Rast3d_error("Rast3d_readHeader: error extracting header key(s) of file %s",
path);
return 0;
}
@@ -148,7 +148,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_writeHeader(RASTER3D_Map * map, int proj, int zone, double north, double south,
+Rast3d_writeHeader(RASTER3D_Map * map, int proj, int zone, double north, double south,
double east, double west, double top, double bottom, int rows,
int cols, int depths, double ew_res, double ns_res,
double tb_res, int tileX, int tileY, int tileZ, int type,
@@ -160,7 +160,7 @@
headerKeys = G_create_key_value();
- if (!G3d_readWriteHeader(headerKeys, 0,
+ if (!Rast3d_readWriteHeader(headerKeys, 0,
&proj, &zone,
&north, &south, &east, &west, &top, &bottom,
&rows, &cols, &depths,
@@ -169,13 +169,13 @@
&type, &compression, &useRle, &useLzw,
&precision, &dataOffset, &useXdr, &hasIndex,
&unit)) {
- G3d_error("G3d_writeHeader: error adding header key(s) for file %s",
+ Rast3d_error("Rast3d_writeHeader: error adding header key(s) for file %s",
path);
return 0;
}
- G3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
- G3d_makeMapsetMapDirectory(map->fileName);
+ Rast3d_filename(path, RASTER3D_HEADER_ELEMENT, map->fileName, map->mapset);
+ Rast3d_makeMapsetMapDirectory(map->fileName);
G_write_key_value_file(path, headerKeys);
G_free_key_value(headerKeys);
@@ -211,7 +211,7 @@
* \return int
*/
-int G3d_cacheSizeEncode(int cacheCode, int n)
+int Rast3d_cacheSizeEncode(int cacheCode, int n)
{
if (cacheCode >= RASTER3D_NO_CACHE)
return cacheCode * n;
@@ -219,14 +219,14 @@
return cacheCode;
if (cacheCode < RASTER3D_USE_CACHE_XYZ)
- G3d_fatalError("G3d_cacheSizeEncode: invalid cache code");
+ Rast3d_fatalError("Rast3d_cacheSizeEncode: invalid cache code");
return n * (-10) + cacheCode;
}
/*---------------------------------------------------------------------------*/
-int G3d__computeCacheSize(RASTER3D_Map * map, int cacheCode)
+int Rast3d__computeCacheSize(RASTER3D_Map * map, int cacheCode)
{
int n, size;
@@ -254,7 +254,7 @@
else if (cacheCode == RASTER3D_USE_CACHE_XYZ)
size = map->nTiles;
else
- G3d_fatalError("G3d__computeCacheSize: invalid cache code");
+ Rast3d_fatalError("Rast3d__computeCacheSize: invalid cache code");
return RASTER3D_MIN(size, map->nTiles);
}
@@ -266,7 +266,7 @@
/* and initializes the index and cache. This function should be taken apart. */
int
-G3d_fillHeader(RASTER3D_Map * map, int operation, int compression, int useRle,
+Rast3d_fillHeader(RASTER3D_Map * map, int operation, int compression, int useRle,
int useLzw, int type, int precision, int cache, int hasIndex,
int useXdr, int typeIntern, int nofHeaderBytes, int tileX,
int tileY, int tileZ, int proj, int zone, double north,
@@ -275,7 +275,7 @@
double ns_res, double tb_res, char *unit)
{
if (!RASTER3D_VALID_OPERATION(operation))
- G3d_fatalError("G3d_fillHeader: operation not valid\n");
+ Rast3d_fatalError("Rast3d_fillHeader: operation not valid\n");
map->operation = operation;
@@ -299,7 +299,7 @@
map->region.ns_res = ns_res;
map->region.tb_res = tb_res;
- G3d_adjustRegion(&(map->region));
+ Rast3d_adjustRegion(&(map->region));
map->tileX = tileX;
map->tileY = tileY;
@@ -327,28 +327,28 @@
map->clipZ = -1;
if ((type != FCELL_TYPE) && (type != DCELL_TYPE))
- G3d_fatalError("G3d_fillHeader: invalid type");
+ Rast3d_fatalError("Rast3d_fillHeader: invalid type");
map->type = type;
if ((typeIntern != FCELL_TYPE) && (typeIntern != DCELL_TYPE))
- G3d_fatalError("G3d_fillHeader: invalid type");
+ Rast3d_fatalError("Rast3d_fillHeader: invalid type");
map->typeIntern = typeIntern;
if (!RASTER3D_VALID_XDR_OPTION(useXdr))
- G3d_fatalError("G3d_fillHeader: invalid xdr option");
+ Rast3d_fatalError("Rast3d_fillHeader: invalid xdr option");
map->useXdr = useXdr;
map->offset = nofHeaderBytes;
if ((map->fileEndPtr = lseek(map->data_fd, (long)0, SEEK_END)) == -1) {
- G3d_error("G3d_fillHeader: can't position file");
+ Rast3d_error("Rast3d_fillHeader: can't position file");
return 0;
}
map->useCache = (cache != RASTER3D_NO_CACHE);
- map->numLengthIntern = G3d_length(map->typeIntern);
- map->numLengthExtern = G3d_externLength(map->type);
+ map->numLengthIntern = Rast3d_length(map->typeIntern);
+ map->numLengthExtern = Rast3d_externLength(map->type);
map->compression = compression;
map->useRle = useRle;
@@ -362,9 +362,9 @@
tmpCompressLength = map->tileSize *
RASTER3D_MAX(map->numLengthIntern, map->numLengthExtern) +
RLE_STATUS_BYTES;
- tmpCompress = G3d_malloc(tmpCompressLength);
+ tmpCompress = Rast3d_malloc(tmpCompressLength);
if (tmpCompress == NULL) {
- G3d_error("G3d_fillHeader: error in G3d_malloc");
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_malloc");
return 0;
}
}
@@ -374,9 +374,9 @@
tmpCompressLength = map->tileSize *
RASTER3D_MAX(map->numLengthIntern, map->numLengthExtern) +
RLE_STATUS_BYTES;
- tmpCompress = G3d_realloc(tmpCompress, tmpCompressLength);
+ tmpCompress = Rast3d_realloc(tmpCompress, tmpCompressLength);
if (tmpCompress == NULL) {
- G3d_error("G3d_fillHeader: error in G3d_realloc");
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_realloc");
return 0;
}
}
@@ -384,8 +384,8 @@
#define XDR_MISUSE_BYTES 10
- if (!G3d_initFpXdr(map, XDR_MISUSE_BYTES)) {
- G3d_error("G3d_fillHeader: error in G3d_initFpXdr");
+ if (!Rast3d_initFpXdr(map, XDR_MISUSE_BYTES)) {
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_initFpXdr");
return 0;
}
@@ -394,27 +394,27 @@
map->useCache = 0;
map->cache = NULL;
/* allocate one tile buffer */
- map->data = G3d_malloc(map->tileSize * map->numLengthIntern);
+ map->data = Rast3d_malloc(map->tileSize * map->numLengthIntern);
if (map->data == NULL) {
- G3d_error("G3d_fillHeader: error in G3d_malloc");
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_malloc");
return 0;
}
map->currentIndex = -1;
}
else {
- if (!G3d_initCache(map,
+ if (!Rast3d_initCache(map,
RASTER3D_MAX(1,
- RASTER3D_MIN(G3d__computeCacheSize(map, cache),
+ RASTER3D_MIN(Rast3d__computeCacheSize(map, cache),
g3d_cache_max /
map->tileSize /
map->numLengthIntern)))) {
- G3d_error("G3d_fillHeader: error in G3d_initCache");
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_initCache");
return 0;
}
}
- if (!G3d_initIndex(map, hasIndex)) {
- G3d_error("G3d_fillHeader: error in G3d_initIndex");
+ if (!Rast3d_initIndex(map, hasIndex)) {
+ Rast3d_error("Rast3d_fillHeader: error in Rast3d_initIndex");
return 0;
}
Modified: grass/trunk/lib/raster3d/headerinfo.c
===================================================================
--- grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -16,7 +16,7 @@
* \return void
*/
-void G3d_getCoordsMap(RASTER3D_Map * map, int *rows, int *cols, int *depths)
+void Rast3d_getCoordsMap(RASTER3D_Map * map, int *rows, int *cols, int *depths)
{
*rows = map->region.rows;
*cols = map->region.cols;
@@ -25,7 +25,7 @@
/*---------------------------------------------------------------------------*/
-void G3d_getCoordsMapWindow(RASTER3D_Map * map, int *rows, int *cols, int *depths)
+void Rast3d_getCoordsMapWindow(RASTER3D_Map * map, int *rows, int *cols, int *depths)
{
*rows = map->window.rows;
*cols = map->window.cols;
@@ -48,7 +48,7 @@
* \return void
*/
-void G3d_getNofTilesMap(RASTER3D_Map * map, int *nx, int *ny, int *nz)
+void Rast3d_getNofTilesMap(RASTER3D_Map * map, int *nx, int *ny, int *nz)
{
*nx = map->nx;
*ny = map->ny;
@@ -74,7 +74,7 @@
*/
void
-G3d_getRegionMap(RASTER3D_Map * map, double *north, double *south, double *east,
+Rast3d_getRegionMap(RASTER3D_Map * map, double *north, double *south, double *east,
double *west, double *top, double *bottom)
{
*north = map->region.north;
@@ -88,7 +88,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_getWindowMap(RASTER3D_Map * map, double *north, double *south, double *east,
+Rast3d_getWindowMap(RASTER3D_Map * map, double *north, double *south, double *east,
double *west, double *top, double *bottom)
{
*north = map->window.north;
@@ -112,16 +112,16 @@
* \return void
*/
-void G3d_getRegionStructMap(RASTER3D_Map * map, RASTER3D_Region * region)
+void Rast3d_getRegionStructMap(RASTER3D_Map * map, RASTER3D_Region * region)
{
- G3d_regionCopy(region, &(map->region));
+ Rast3d_regionCopy(region, &(map->region));
}
/*---------------------------------------------------------------------------*/
-void G3d_getWindowStructMap(RASTER3D_Map * map, RASTER3D_Region * window)
+void Rast3d_getWindowStructMap(RASTER3D_Map * map, RASTER3D_Region * window)
{
- G3d_regionCopy(window, &(map->window));
+ Rast3d_regionCopy(window, &(map->window));
}
/*---------------------------------------------------------------------------*/
@@ -139,7 +139,7 @@
* \return void
*/
-void G3d_getTileDimensionsMap(RASTER3D_Map * map, int *x, int *y, int *z)
+void Rast3d_getTileDimensionsMap(RASTER3D_Map * map, int *x, int *y, int *z)
{
*x = map->tileX;
*y = map->tileY;
@@ -158,7 +158,7 @@
* \return int
*/
-int G3d_tileTypeMap(RASTER3D_Map * map)
+int Rast3d_tileTypeMap(RASTER3D_Map * map)
{
return map->typeIntern;
}
@@ -175,7 +175,7 @@
* \return int
*/
-int G3d_fileTypeMap(RASTER3D_Map * map)
+int Rast3d_fileTypeMap(RASTER3D_Map * map)
{
return map->type;
}
@@ -192,7 +192,7 @@
* \return int
*/
-int G3d_tilePrecisionMap(RASTER3D_Map * map)
+int Rast3d_tilePrecisionMap(RASTER3D_Map * map)
{
return map->precision;
}
@@ -209,7 +209,7 @@
* \return int
*/
-int G3d_tileUseCacheMap(RASTER3D_Map * map)
+int Rast3d_tileUseCacheMap(RASTER3D_Map * map)
{
return map->useCache;
}
@@ -225,7 +225,7 @@
* \return void
*/
-void G3d_printHeader(RASTER3D_Map * map)
+void Rast3d_printHeader(RASTER3D_Map * map)
{
double rangeMin, rangeMax;
@@ -256,7 +256,7 @@
(map->operation == RASTER3D_WRITE_DATA ? ", File Cache used" : ""));
}
- G3d_range_min_max(map, &rangeMin, &rangeMax);
+ Rast3d_range_min_max(map, &rangeMin, &rangeMax);
printf(" Region: (%f %f) (%f %f) (%f %f)\n",
map->region.south, map->region.north, map->region.west,
@@ -265,11 +265,11 @@
map->region.depths);
printf(" Tile size (%d %d %d)\n", map->tileX, map->tileY, map->tileZ);
printf(" Range (");
- if (G3d_isNullValueNum(&rangeMin, DCELL_TYPE))
+ if (Rast3d_isNullValueNum(&rangeMin, DCELL_TYPE))
printf("NULL, ");
else
printf("%f, ", (double)rangeMin);
- if (G3d_isNullValueNum(&rangeMax, DCELL_TYPE))
+ if (Rast3d_isNullValueNum(&rangeMax, DCELL_TYPE))
printf("NULL)\n");
else
printf("%f)\n", (double)rangeMax);
Modified: grass/trunk/lib/raster3d/history.c
===================================================================
--- grass/trunk/lib/raster3d/history.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/history.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -1,7 +1,7 @@
/**********************************************************************
*
- * G3d_readHistory (name, mapset, hist)
+ * Rast3d_readHistory (name, mapset, hist)
* char *name name of map
* char *mapset mapset that map belongs to
* struct History *hist structure to hold history info
@@ -16,7 +16,7 @@
*
**********************************************************************
*
- * G3d_writeHistory (name, hist)
+ * Rast3d_writeHistory (name, hist)
* char *name name of map
* struct History *hist structure holding history info
*
@@ -61,7 +61,7 @@
* \return int
*/
-int G3d_readHistory(const char *name, const char *mapset, struct History *hist)
+int Rast3d_readHistory(const char *name, const char *mapset, struct History *hist)
{
FILE *fp;
@@ -94,7 +94,7 @@
* \return int
*/
-int G3d_writeHistory(const char *name, struct History *hist)
+int Rast3d_writeHistory(const char *name, struct History *hist)
/* This function is adapted from Rast_write_history */
{
FILE *fp = G_fopen_new_misc(RASTER3D_DIRECTORY, RASTER3D_HISTORY_ELEMENT, name);
Modified: grass/trunk/lib/raster3d/index.c
===================================================================
--- grass/trunk/lib/raster3d/index.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/index.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -7,7 +7,7 @@
/*---------------------------------------------------------------------------*/
-static int G3d_readIndex(RASTER3D_Map * map)
+static int Rast3d_readIndex(RASTER3D_Map * map)
{
unsigned char *tmp, *tmp2;
int dummy1, dummy2, indexLength, tileIndex;
@@ -15,21 +15,21 @@
indexLast = lseek(map->data_fd, (long)0, SEEK_END);
if (indexLast == -1) {
- G3d_error("G3d_readIndex: can't position file");
+ Rast3d_error("Rast3d_readIndex: can't position file");
return 0;
}
indexLength = indexLast - map->indexOffset;
if (lseek(map->data_fd, map->indexOffset, SEEK_SET) == -1) {
- G3d_error("G3d_readIndex: can't position file");
+ Rast3d_error("Rast3d_readIndex: can't position file");
return 0;
}
- tmp = G3d_malloc(map->indexLongNbytes * map->nTiles);
+ tmp = Rast3d_malloc(map->indexLongNbytes * map->nTiles);
if (tmp == NULL) {
- G3d_error("G3d_readIndex: error in G3d_malloc");
+ Rast3d_error("Rast3d_readIndex: error in Rast3d_malloc");
return 0;
}
@@ -37,9 +37,9 @@
if (indexLength > sizeof(long) * map->nTiles) {
/*->index large enough? */
- tmp2 = G3d_malloc(indexLength);
+ tmp2 = Rast3d_malloc(indexLength);
if (tmp2 == NULL) {
- G3d_error("G3d_readIndex: error in G3d_malloc");
+ Rast3d_error("Rast3d_readIndex: error in Rast3d_malloc");
return 0;
}
}
@@ -47,7 +47,7 @@
tmp2 = (unsigned char *)map->index;
if (read(map->data_fd, tmp2, indexLength) != indexLength) {
- G3d_error("G3d_readIndex: can't read file");
+ Rast3d_error("Rast3d_readIndex: can't read file");
return 0;
}
@@ -55,27 +55,27 @@
&dummy1, &dummy2);
if (indexLength > sizeof(long) * map->nTiles)
- G3d_free(tmp2);
+ Rast3d_free(tmp2);
}
else /* NO RLE */ if (read(map->data_fd, tmp, indexLength) != indexLength) {
- G3d_error("G3d_readIndex: can't read file");
+ Rast3d_error("Rast3d_readIndex: can't read file");
return 0;
}
- G3d_longDecode(tmp, map->index, map->nTiles, map->indexLongNbytes);
+ Rast3d_longDecode(tmp, map->index, map->nTiles, map->indexLongNbytes);
for (tileIndex = 0; tileIndex < map->nTiles; tileIndex++)
if (map->index[tileIndex] == 0)
map->index[tileIndex] = -1;
- G3d_free(tmp);
+ Rast3d_free(tmp);
return 1;
}
/*---------------------------------------------------------------------------*/
-int G3d_flushIndex(RASTER3D_Map * map)
+int Rast3d_flushIndex(RASTER3D_Map * map)
{
int sizeCompressed, indexLength, tileIndex;
unsigned char *tmp;
@@ -86,16 +86,16 @@
map->indexOffset = lseek(map->data_fd, (long)0, SEEK_END);
if (map->indexOffset == -1) {
- G3d_error("G3d_flushIndex: can't rewind file");
+ Rast3d_error("Rast3d_flushIndex: can't rewind file");
return 0;
}
- map->indexNbytesUsed = G3d_longEncode(&(map->indexOffset),
+ map->indexNbytesUsed = Rast3d_longEncode(&(map->indexOffset),
(unsigned char *)&ldummy, 1);
- tmp = G3d_malloc(sizeof(long) * map->nTiles);
+ tmp = Rast3d_malloc(sizeof(long) * map->nTiles);
if (tmp == NULL) {
- G3d_error("G3d_flushIndex: error in G3d_malloc");
+ Rast3d_error("Rast3d_flushIndex: error in Rast3d_malloc");
return 0;
}
@@ -103,14 +103,14 @@
if (map->index[tileIndex] == -1)
map->index[tileIndex] = 0;
- (void)G3d_longEncode(map->index, tmp, map->nTiles);
+ (void)Rast3d_longEncode(map->index, tmp, map->nTiles);
sizeCompressed = G_rle_count_only(tmp, sizeof(long) * map->nTiles, 1);
if (sizeCompressed >= map->nTiles * sizeof(long)) {
indexLength = map->nTiles * sizeof(long);
if (write(map->data_fd, tmp, indexLength) != indexLength) {
- G3d_error("G3d_flushIndex: can't write file");
+ Rast3d_error("Rast3d_flushIndex: can't write file");
return 0;
}
}
@@ -118,14 +118,14 @@
indexLength = sizeCompressed;
G_rle_encode(tmp, (char *)map->index, sizeof(long) * map->nTiles, 1);
if (write(map->data_fd, map->index, sizeCompressed) != sizeCompressed) {
- G3d_error("G3d_flushIndex: can't write file");
+ Rast3d_error("Rast3d_flushIndex: can't write file");
return 0;
}
}
- G3d_free(tmp);
- if (!G3d_readIndex(map)) {
- G3d_error("G3d_flushIndex: error in G3d_readIndex");
+ Rast3d_free(tmp);
+ if (!Rast3d_readIndex(map)) {
+ Rast3d_error("Rast3d_flushIndex: error in Rast3d_readIndex");
return 0;
}
@@ -152,18 +152,18 @@
/*---------------------------------------------------------------------------*/
-int G3d_initIndex(RASTER3D_Map * map, int hasIndex)
+int Rast3d_initIndex(RASTER3D_Map * map, int hasIndex)
{
int tile;
int i0, i1, i2, i3, i4, i5, offset, nofElts;
int *offsetP;
map->hasIndex = hasIndex;
- map->index = G3d_malloc(sizeof(long) * map->nTiles);
- map->tileLength = G3d_malloc(sizeof(int) * map->nTiles);
+ map->index = Rast3d_malloc(sizeof(long) * map->nTiles);
+ map->tileLength = Rast3d_malloc(sizeof(int) * map->nTiles);
if ((map->index == NULL) || (map->tileLength == NULL)) {
- G3d_error("G3d_initIndex: error in G3d_malloc");
+ Rast3d_error("Rast3d_initIndex: error in Rast3d_malloc");
return 0;
}
@@ -177,7 +177,7 @@
offset = 0;
for (tile = 0; tile < map->nTiles; tile++) {
map->index[tile] = offset * map->numLengthExtern + map->offset;
- nofElts = G3d_computeClippedTileDimensions
+ nofElts = Rast3d_computeClippedTileDimensions
(map, tile, &i0, &i1, &i2, &i3, &i4, &i5);
map->tileLength[tile] = nofElts * map->numLengthExtern;
offset += nofElts;
@@ -185,14 +185,14 @@
return 1;
}
- if (!G3d_readIndex(map)) {
- G3d_error("G3d_initIndex: error in G3d_readIndex");
+ if (!Rast3d_readIndex(map)) {
+ Rast3d_error("Rast3d_initIndex: error in Rast3d_readIndex");
return 0;
}
- offsetP = G3d_malloc(sizeof(int) * map->nTiles);
+ offsetP = Rast3d_malloc(sizeof(int) * map->nTiles);
if (offsetP == NULL) {
- G3d_error("G3d_initIndex: error in G3d_malloc");
+ Rast3d_error("Rast3d_initIndex: error in Rast3d_malloc");
return 0;
}
@@ -217,7 +217,7 @@
map->tileLength[offsetP[map->nTiles - 1]] =
map->indexOffset - map->index[offsetP[map->nTiles - 1]];
- G3d_free(offsetP);
+ Rast3d_free(offsetP);
return 1;
}
Modified: grass/trunk/lib/raster3d/intio.c
===================================================================
--- grass/trunk/lib/raster3d/intio.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/intio.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -8,7 +8,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_writeInts(int fd, int useXdr, const int *i, int nofNum)
+int Rast3d_writeInts(int fd, int useXdr, const int *i, int nofNum)
{
int firstTime = 1;
XDR xdrEncodeStream;
@@ -16,11 +16,11 @@
u_int n;
if (nofNum <= 0)
- G3d_fatalError("G3d_writeInts: nofNum out of range");
+ Rast3d_fatalError("Rast3d_writeInts: nofNum out of range");
if (useXdr == RASTER3D_NO_XDR) {
if (write(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) {
- G3d_error("G3d_writeInts: writing to file failed");
+ Rast3d_error("Rast3d_writeInts: writing to file failed");
return 0;
}
else {
@@ -40,19 +40,19 @@
n = 1024;
if (!xdr_setpos(&xdrEncodeStream, 0)) {
- G3d_error("G3d_writeInts: positioning xdr failed");
+ Rast3d_error("Rast3d_writeInts: positioning xdr failed");
return 0;
}
if (!xdr_vector(&xdrEncodeStream, (char *)i, n, sizeof(int),
(xdrproc_t) xdr_int)) {
- G3d_error("G3d_writeInts: writing xdr failed");
+ Rast3d_error("Rast3d_writeInts: writing xdr failed");
return 0;
}
if (write(fd, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * n) !=
RASTER3D_XDR_INT_LENGTH * n) {
- G3d_error("G3d_writeInts: writing xdr to file failed");
+ Rast3d_error("Rast3d_writeInts: writing xdr to file failed");
return 0;
}
@@ -65,7 +65,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_readInts(int fd, int useXdr, int *i, int nofNum)
+int Rast3d_readInts(int fd, int useXdr, int *i, int nofNum)
{
int firstTime = 1;
XDR xdrDecodeStream;
@@ -73,11 +73,11 @@
u_int n;
if (nofNum <= 0)
- G3d_fatalError("G3d_readInts: nofNum out of range");
+ Rast3d_fatalError("Rast3d_readInts: nofNum out of range");
if (useXdr == RASTER3D_NO_XDR) {
if (read(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) {
- G3d_error("G3d_readInts: reading from file failed");
+ Rast3d_error("Rast3d_readInts: reading from file failed");
return 0;
}
else {
@@ -98,18 +98,18 @@
if (read(fd, xdrIntBuf, RASTER3D_XDR_INT_LENGTH * n) !=
RASTER3D_XDR_INT_LENGTH * n) {
- G3d_error("G3d_readInts: reading xdr from file failed");
+ Rast3d_error("Rast3d_readInts: reading xdr from file failed");
return 0;
}
if (!xdr_setpos(&xdrDecodeStream, 0)) {
- G3d_error("G3d_readInts: positioning xdr failed");
+ Rast3d_error("Rast3d_readInts: positioning xdr failed");
return 0;
}
if (!xdr_vector(&xdrDecodeStream, (char *)i, n, sizeof(int),
(xdrproc_t) xdr_int)) {
- G3d_error("G3d_readInts: reading xdr failed");
+ Rast3d_error("Rast3d_readInts: reading xdr failed");
return 0;
}
Modified: grass/trunk/lib/raster3d/keys.c
===================================================================
--- grass/trunk/lib/raster3d/keys.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/keys.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -4,12 +4,12 @@
/*---------------------------------------------------------------------------*/
-int G3d_keyGetInt(struct Key_Value *keys, const char *key, int *i)
+int Rast3d_keyGetInt(struct Key_Value *keys, const char *key, int *i)
{
const char *str;
if ((str = G_find_key_value(key, keys)) == NULL) {
- G3d_error("G3d_keyGetInt: cannot find field %s in key structure",
+ Rast3d_error("Rast3d_keyGetInt: cannot find field %s in key structure",
key);
return 0;
}
@@ -17,18 +17,18 @@
if (sscanf(str, "%d", i) == 1)
return 1;
- G3d_error("G3d_keyGetInt: invalid value: field %s in key structure", key);
+ Rast3d_error("Rast3d_keyGetInt: invalid value: field %s in key structure", key);
return 0;
}
/*---------------------------------------------------------------------------*/
-int G3d_keyGetDouble(struct Key_Value *keys, const char *key, double *d)
+int Rast3d_keyGetDouble(struct Key_Value *keys, const char *key, double *d)
{
const char *str;
if ((str = G_find_key_value(key, keys)) == NULL) {
- G3d_error("G3d_keyGetDouble: cannot find field %s in key structure",
+ Rast3d_error("Rast3d_keyGetDouble: cannot find field %s in key structure",
key);
return 0;
}
@@ -36,7 +36,7 @@
if (sscanf(str, "%lf", d) == 1)
return 1;
- G3d_error("G3d_keyGetDouble: invalid value: field %s in key structure",
+ Rast3d_error("Rast3d_keyGetDouble: invalid value: field %s in key structure",
key);
return 0;
}
@@ -44,12 +44,12 @@
/*---------------------------------------------------------------------------*/
int
-G3d_keyGetString(struct Key_Value *keys, const char *key, char **returnStr)
+Rast3d_keyGetString(struct Key_Value *keys, const char *key, char **returnStr)
{
const char *str;
if ((str = G_find_key_value(key, keys)) == NULL) {
- G3d_error("G3d_keyGetString: cannot find field %s in key structure",
+ Rast3d_error("Rast3d_keyGetString: cannot find field %s in key structure",
key);
return 0;
}
@@ -61,13 +61,13 @@
/*---------------------------------------------------------------------------*/
int
-G3d_keyGetValue(struct Key_Value *keys, const char *key, char *val1,
+Rast3d_keyGetValue(struct Key_Value *keys, const char *key, char *val1,
char *val2, int result1, int result2, int *resultVar)
{
const char *str;
if ((str = G_find_key_value(key, keys)) == NULL) {
- G3d_error("G3d_keyGetValue: cannot find field %s in key structure",
+ Rast3d_error("Rast3d_keyGetValue: cannot find field %s in key structure",
key);
return 0;
}
@@ -81,14 +81,14 @@
return 1;
}
- G3d_error("G3d_keyGetValue: invalid type: field %s in key structure",
+ Rast3d_error("Rast3d_keyGetValue: invalid type: field %s in key structure",
key);
return 0;
}
/*---------------------------------------------------------------------------*/
-int G3d_keySetInt(struct Key_Value *keys, const char *key, const int *i)
+int Rast3d_keySetInt(struct Key_Value *keys, const char *key, const int *i)
{
char keyValStr[200];
@@ -99,7 +99,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_keySetDouble(struct Key_Value *keys, const char *key, const double *d)
+int Rast3d_keySetDouble(struct Key_Value *keys, const char *key, const double *d)
{
char keyValStr[200];
@@ -111,7 +111,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_keySetString(struct Key_Value *keys, const char *key,
+Rast3d_keySetString(struct Key_Value *keys, const char *key,
char *const *keyValStr)
{
G_set_key_value(key, *keyValStr, keys);
@@ -121,7 +121,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_keySetValue(struct Key_Value *keys, const char *key, const char *val1,
+Rast3d_keySetValue(struct Key_Value *keys, const char *key, const char *val1,
const char *val2, int keyval1, int keyval2,
const int *keyvalVar)
{
@@ -135,6 +135,6 @@
return 1;
}
- G3d_error("G3d_keySetValue: wrong key value");
+ Rast3d_error("Rast3d_keySetValue: wrong key value");
return 0;
}
Modified: grass/trunk/lib/raster3d/lib.dox
===================================================================
--- grass/trunk/lib/raster3d/lib.dox 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/lib.dox 2011-08-10 17:27:10 UTC (rev 47537)
@@ -156,30 +156,30 @@
In non-cache mode the application should only use the functions
<P>
-int G3d_readTile()
+int Rast3d_readTile()
<P>
and
<P>
-int G3d_writeTile()
+int Rast3d_writeTile()
<P>
to read and write tiles. The application can use one tile provided by the map
-structure as buffer. See <TT>G3d_getTilePtr()</TT>.
+structure as buffer. See <TT>Rast3d_getTilePtr()</TT>.
<P>
In cache mode the application can access cell-values directly by their
coordinates. The corresponding functions are
<P>
-int G3d_getValue()
+int Rast3d_getValue()
<P>
and
<P>
-int G3d_putValue()
+int Rast3d_putValue()
<P>
and their corresponding typed versions.
@@ -191,7 +191,7 @@
explicitly requested.
<BR>
<P>
-If the map is new <TT>G3d_getValue()</TT> can be used even if the tile which
+If the map is new <TT>Rast3d_getValue()</TT> can be used even if the tile which
contains the cell has already been flushed to the data file. In this case the
tile is simply read back into the memory-cache from the data file.
<BR>
@@ -210,7 +210,7 @@
<P>
As an example consider the case where the data is stored in the file with double
precision and the tiles are stored in memory in single precision. Then using
-<TT>G3d_getValue()</TT> will actually return a double precision number whose precision
+<TT>Rast3d_getValue()</TT> will actually return a double precision number whose precision
is only 23 bits. It is therefore a good idea to use the types in the memory
consistently.
<BR>
@@ -301,7 +301,7 @@
<P>
For performance reasons it is a good idea to use function
-<TT>G3d_retile()</TT> before using the file in other applications.
+<TT>Rast3d_retile()</TT> before using the file in other applications.
<P>
@@ -339,7 +339,7 @@
<BR>
<P>
The default <EM>3d</EM> window file is <EM>WIND3</EM> located in the mapset.
-Application programs should use <TT>G3d_useWindowParams()</TT> to allow the
+Application programs should use <TT>Rast3d_useWindowParams()</TT> to allow the
user to overwrite this default.
<P>
@@ -439,10 +439,10 @@
Environment variable RASTER3D_MAX_CACHE_SIZE.
<P>
-void G3d_setCacheLimit(int nBytes)Set cache limit
+void Rast3d_setCacheLimit(int nBytes)Set cache limit
<P>
-int G3d_getCacheLimit(int nBytes)Get cache limit
+int Rast3d_getCacheLimit(int nBytes)Get cache limit
<P>
@@ -462,10 +462,10 @@
Environment variable RASTER3D_DEFAULT_CACHE_SIZE.
<P>
-void G3d_setCacheSize(int nTiles)
+void Rast3d_setCacheSize(int nTiles)
<P>
-int G3d_getCacheSize()
+int Rast3d_getCacheSize()
<P>
@@ -485,8 +485,8 @@
Environment variables RASTER3D_USE_COMPRESSION and RASTER3D_NO_COMPRESSION.
<P>
-See functions G3d_setCompressionMode() (cf.
-Section 22.3.2.3 ) and G3d_getCompressionMode() (cf. Section 22.3.2.3 ).
+See functions Rast3d_setCompressionMode() (cf.
+Section 22.3.2.3 ) and Rast3d_getCompressionMode() (cf. Section 22.3.2.3 ).
<P>
@@ -504,8 +504,8 @@
Environment variables RASTER3D_USE_RLE and RASTER3D_NO_RLE.
<P>
-See functions G3d_setCompressionMode() (cf.
-Section 22.3.2.3) and G3d_getCompressionMode() (cf. Section 22.3.2.3).
+See functions Rast3d_setCompressionMode() (cf.
+Section 22.3.2.3) and Rast3d_getCompressionMode() (cf. Section 22.3.2.3).
\section Setting_the_precision Setting the precision
@@ -522,14 +522,14 @@
Environment variables RASTER3D_PRECISION and RASTER3D_MAX_PRECISION.
<P>
-void G3d_setCompressionMode(int doCompress, int doLzw, int doRle, int
+void Rast3d_setCompressionMode(int doCompress, int doLzw, int doRle, int
precision) <EM>doCompress</EM> should be one of RASTER3D_NO_COMPRESSION and
RASTER3D_COMPRESSION, <EM>doRle</EM> should be either RASTER3D_NO_RLE or
RASTER3D_USE_RLE, and <EM>precision</EM> should be either RASTER3D_MAX_PRECISION or
a positive integer.
<P>
-void G3d_getCompressionMode(int *doCompress, int *doLzw, int *doRle,
+void Rast3d_getCompressionMode(int *doCompress, int *doLzw, int *doRle,
int *precision)
<P>
@@ -551,10 +551,10 @@
RASTER3D_TILE_DIMENSION_Z.
<P>
-void G3d_setTileDimension(int tileX, int tileY, int tileZ)
+void Rast3d_setTileDimension(int tileX, int tileY, int tileZ)
<P>
-void G3d_getTileDimension(int *tileX, int *tileY, int *tileZ)
+void Rast3d_getTileDimension(int *tileX, int *tileY, int *tileZ)
<P>
@@ -572,10 +572,10 @@
Environment variables RASTER3D_WRITE_FLOAT and RASTER3D_WRITE_DOUBLE.
<P>
-void G3d_setFileType(int type)
+void Rast3d_setFileType(int type)
<P>
-int G3d_getFileType(int type)
+int Rast3d_getFileType(int type)
<P>
@@ -604,13 +604,13 @@
See functions
<P>
-<TT>G3d_useWindowParams()</TT>,
+<TT>Rast3d_useWindowParams()</TT>,
<P>
-<TT>G3d_setWindow()</TT>, and
+<TT>Rast3d_setWindow()</TT>, and
<P>
-<TT>G3d_setWindowMap()</TT>.
+<TT>Rast3d_setWindowMap()</TT>.
<P>
@@ -623,7 +623,7 @@
No environment variable.
<P>
-void G3d_setUnit (unit)
+void Rast3d_setUnit (unit)
char *unit;
<P>
@@ -633,32 +633,32 @@
<P>
This variable specifies the function which is invoked when an error
(not a fatal error) occurs. For example setting the error function to
-<TT>G3d_fatalError</TT> simplifies debugging with dbx and also might show
+<TT>Rast3d_fatalError</TT> simplifies debugging with dbx and also might show
errors which are missed because the application does not check the
return value.
<P>
-Default <TT>G3d_skipError</TT>.
+Default <TT>Rast3d_skipError</TT>.
<P>
Environment variables RASTER3D_USE_FATAL_ERROR and RASTER3D_USE_PRINT_ERROR.
<P>
-void G3d_setErrorFun(void (*fun)(char *))
+void Rast3d_setErrorFun(void (*fun)(char *))
<P>
The following 3 functions are possible choices for error functions.
<P>
-void G3d_skipError(char (*msg)(char *)) This function ignores the
+void Rast3d_skipError(char (*msg)(char *)) This function ignores the
error.
<P>
-void G3d_printError(char (*msg)(char *)) This function prints the
+void Rast3d_printError(char (*msg)(char *)) This function prints the
error message <EM>msg</EM> to <EM>stderr</EM> and returns.
<P>
-void G3d_fatalError(char (*msg)(char *)) This function prints the
+void Rast3d_fatalError(char (*msg)(char *)) This function prints the
error message <EM>msg</EM> to <EM>stderr</EM>, flushes <EM>stdout</EM>
and <EM>stderr</EM>, and terminates the program with a segementation fault.
@@ -669,7 +669,7 @@
\subsection Opening_and_Closing_RASTER3D_Files Opening and Closing RASTER3D Files
<P>
-void *G3d_openCellOld(char *name, char *mapset, RASTER3D_Region *window,
+void *Rast3d_openCellOld(char *name, char *mapset, RASTER3D_Region *window,
int type, int cache)Opens existing g3d-file <EM>name</EM> in <EM>mapset</EM>.
<P>
@@ -678,28 +678,28 @@
cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- RASTER3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf.
+ RASTER3D_USE_CACHE_XYZ, the result of <TT>Rast3d_cacheSizeEncode()</TT> (cf.
Section 22.4.6), or any positive integer which
specifies the number of tiles buffered in the cache. <EM>window</EM> sets the
window-region for the map. It is either a pointer to a window structure or
RASTER3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
- set via <TT>G3d_setWindow()</TT> (cf. Section 22.4.16).
+ set via <TT>Rast3d_setWindow()</TT> (cf. Section 22.4.16).
To modify the window for the map after it has already been opened use
- <TT>G3d_setWindowMap()</TT> (cf. Section 22.4.16).
+ <TT>Rast3d_setWindowMap()</TT> (cf. Section 22.4.16).
<P>
Returns a pointer to the cell structure ... if successful, NULL ...
otherwise.
<P>
-void *G3d_openCellNew(char *name, int type, int cache, RASTER3D_Region
+void *Rast3d_openCellNew(char *name, int type, int cache, RASTER3D_Region
*region)Opens new g3d-file with <EM>name</EM> in the current mapset. Tiles
are stored in memory with <EM>type</EM> which must be one of FCELL_TYPE,
DCELL_TYPE, or RASTER3D_TILE_SAME_AS_FILE. <EM>cache</EM> specifies the
cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- RASTER3D_USE_CACHE_XYZ, the result of <TT>G3d_cacheSizeEncode()</TT> (cf.
+ RASTER3D_USE_CACHE_XYZ, the result of <TT>Rast3d_cacheSizeEncode()</TT> (cf.
Section 22.4.6), or any positive integer which
specifies the number of tiles buffered in the cache. <EM>region</EM> specifies
the 3d region.
@@ -709,7 +709,7 @@
NULL ... otherwise.
<P>
-void *G3d_openCellNewParam(char *name, int typeIntern, int cache,
+void *Rast3d_openCellNewParam(char *name, int typeIntern, int cache,
RASTER3D_Region *region, int type, int doLzw, int doRle, int precision, int tileX,
int tileY, int tileZ)Opens new g3d-file with <EM>name</EM> in the current
mapset. Tiles are stored in memory with <EM>typeIntern</EM> which must be one of
@@ -718,7 +718,7 @@
RASTER3D_USE_CACHE_DEFAULT, RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of
- <TT>G3d_cacheSizeEncode()</TT> (cf.
+ <TT>Rast3d_cacheSizeEncode()</TT> (cf.
Section 22.4.6), or any positive integer which
specifies the number of tiles buffered in the cache. <EM>region</EM> specifies
the 3d region.
@@ -728,16 +728,16 @@
assumed by default that compression is used. This function first sets the
global default values to the specified values, and then restores the original
global defaults. This function can be used in conjunction with
- <TT>G3d_setStandard3dInputParams()</TT> (cf.
+ <TT>Rast3d_setStandard3dInputParams()</TT> (cf.
Section 22.4.18) and
- <TT>G3d_getStandard3dParams()</TT>.
+ <TT>Rast3d_getStandard3dParams()</TT>.
<P>
Returns a pointer to the cell structure ... if successful, NULL ...
otherwise.
<P>
-int G3d_closeCell(void *map)Closes g3d-file. If <EM>map</EM> is new
+int Rast3d_closeCell(void *map)Closes g3d-file. If <EM>map</EM> is new
and cache-mode is used for <EM>map</EM> then every tile which is not flushed
before closing is flushed.
@@ -755,7 +755,7 @@
discouraged.
<P>
-int G3d_readTile(void *map, char *tileIndex, int tile, int type)
+int Rast3d_readTile(void *map, char *tileIndex, int tile, int type)
Reads tile with index <EM>tileIndex</EM> into the <EM>tile</EM> buffer. The cells
are stored with type <EM>type</EM> which must be one of FCELL_TYPE and
DCELL_TYPE. If the tile with <EM>tileIndex</EM> is not stored on the file
@@ -768,15 +768,15 @@
0 ... otherwise.
<P>
-int G3d_readTileFloat(void *map, char *tileIndex, int tile)
-Is equivalent to G3d_readTile (map, tileIndex, tile, FCELL_TYPE).
+int Rast3d_readTileFloat(void *map, char *tileIndex, int tile)
+Is equivalent to Rast3d_readTile (map, tileIndex, tile, FCELL_TYPE).
<P>
-int G3d_readTileDouble(void *map, char *tileIndex, int tile)
-Is equivalent to G3d_readTile (map, tileIndex, tile, DCELL_TYPE).
+int Rast3d_readTileDouble(void *map, char *tileIndex, int tile)
+Is equivalent to Rast3d_readTile (map, tileIndex, tile, DCELL_TYPE).
<P>
-int G3d_writeTile(void *map, char *tileIndex, int tile, int type)
+int Rast3d_writeTile(void *map, char *tileIndex, int tile, int type)
Writes tile with index <EM>tileIndex</EM> to the file corresponding to <EM>map</EM>. It is assumed that the cells in <EM>tile</EM> are of <EM>type</EM> which
must be one of FCELL_TYPE and DCELL_TYPE. The actual type used to write the
tile depends on the type specified at the time when <EM>map</EM> is initialized.
@@ -792,19 +792,19 @@
0 ... otherwise.
<P>
-int G3d_writeTileFloat(void *map, char *tileIndex, int tile)
-Is equivalent to <TT>G3d_writeTile (map, tileIndex, tile, FCELL_TYPE).</TT>
+int Rast3d_writeTileFloat(void *map, char *tileIndex, int tile)
+Is equivalent to <TT>Rast3d_writeTile (map, tileIndex, tile, FCELL_TYPE).</TT>
<P>
-int G3d_writeTileDouble(void *map, char *tileIndex, int tile)
-Is equivalent to <TT>G3d_writeTile (map, tileIndex, tile, DCELL_TYPE).</TT>
+int Rast3d_writeTileDouble(void *map, char *tileIndex, int tile)
+Is equivalent to <TT>Rast3d_writeTile (map, tileIndex, tile, DCELL_TYPE).</TT>
<P>
\subsection Reading_and_Writing_Cells Reading and Writing Cells
<P>
-void G3d_getValue(void *map, int x, int y, int z, char *value, int
+void Rast3d_getValue(void *map, int x, int y, int z, char *value, int
type) Returns in <EM>*value</EM> the cell-value of the cell with
window-coordinate <EM>(x, y, z)</EM>. The value returned is of <EM>type</EM>.
@@ -812,15 +812,15 @@
This function invokes a fatal error if an error occurs.
<P>
-float G3d_getFloat(void *map, int x, int y, int z)Is equivalent to
- <TT>G3d_getValue (map, x, y, z, &value, FCELL_TYPE);</TT> return value.
+float Rast3d_getFloat(void *map, int x, int y, int z)Is equivalent to
+ <TT>Rast3d_getValue (map, x, y, z, &value, FCELL_TYPE);</TT> return value.
<P>
-double G3d_getDouble(void *map, int x, int y, int z)Is equivalent
- to <TT>G3d_getValue (map, x, y, z, &value, DCELL_TYPE);</TT> return value.
+double Rast3d_getDouble(void *map, int x, int y, int z)Is equivalent
+ to <TT>Rast3d_getValue (map, x, y, z, &value, DCELL_TYPE);</TT> return value.
<P>
-void G3d_getValueRegion(void *map, int x, int y, int z, char*value,
+void Rast3d_getValueRegion(void *map, int x, int y, int z, char*value,
int type) Returns in <EM>*value</EM> the cell-value of the cell with
region-coordinate <EM>(x, y, z)</EM>. The value returned is of <EM>type</EM>.
Here <EM>region</EM> means the coordinate in the cube of data in the file, i.e.
@@ -830,17 +830,17 @@
This function invokes a fatal error if an error occurs.
<P>
-float G3d_getFloatRegion(void *map, int x, int y, int z)Is
- equivalent to <TT>G3d_getValueRegion (map, x, y, z, &value, FCELL_TYPE);</TT>
+float Rast3d_getFloatRegion(void *map, int x, int y, int z)Is
+ equivalent to <TT>Rast3d_getValueRegion (map, x, y, z, &value, FCELL_TYPE);</TT>
return value.
<P>
-double G3d_getDoubleRegion(void *map, int x, int y, int z)Is
- equivalent to <TT>G3d_getValueRegion (map, x, y, z, &value,
+double Rast3d_getDoubleRegion(void *map, int x, int y, int z)Is
+ equivalent to <TT>Rast3d_getValueRegion (map, x, y, z, &value,
DCELL_TYPE);</TT> return value.
<P>
-int G3d_putValue(void *map, int x, int y, int z, char *value, int
+int Rast3d_putValue(void *map, int x, int y, int z, char *value, int
type)After converting <EM>*value</EM> of <EM>type</EM> into the type specified
at the initialization time (i.e. <EM>typeIntern</EM>) this function writes the
value into the tile buffer corresponding to cell-coordinate <EM>(x, y, z)</EM>.
@@ -853,19 +853,19 @@
0 ... otherwise.
<P>
-int G3d_putFloat(void *map, int x, int y, int z, char *value)Is
- equivalent to G3d_putValue (map, x, y, z, &value, FCELL_TYPE).
+int Rast3d_putFloat(void *map, int x, int y, int z, char *value)Is
+ equivalent to Rast3d_putValue (map, x, y, z, &value, FCELL_TYPE).
<P>
-int G3d_putDouble(void *map, int x, int y, int z, char *value) Is
- equivalent to G3d_putValue (map, x, y, z, &value, DCELL_TYPE).
+int Rast3d_putDouble(void *map, int x, int y, int z, char *value) Is
+ equivalent to Rast3d_putValue (map, x, y, z, &value, DCELL_TYPE).
<P>
\subsection Loading_and_Removing_TilesLoading and Removing Tiles
<P>
-char *G3d_getTilePtr(void *map, int tileIndex) This function
+char *Rast3d_getTilePtr(void *map, int tileIndex) This function
returns a pointer to a tile which contains the data for the tile with index
<EM>tileIndex</EM>. The type of the data stored in the tile depends on the type
specified at the initialization time of <EM>map</EM>. The functionality is
@@ -877,7 +877,7 @@
is read from file and stored in the buffer provided by the map structure.
The pointer to this buffer is returned. If the buffer already contains the
tile with <EM>tileIndex</EM> reading is skipped. Data which was stored in
- earlier calls to <TT>G3d_getTilePtr</TT> is destroyed. If the tile with
+ earlier calls to <TT>Rast3d_getTilePtr</TT> is destroyed. If the tile with
<EM>tileIndex</EM> is not stored on the file corresponding to <EM>map</EM>, and
<EM>tileIndex</EM> is a valid index the buffer is filled with NULL-values.
<BR>
@@ -896,8 +896,8 @@
as if <EM>map</EM> is old and the cache is not used. If the tile with
<EM>tileIndex</EM> is already stored on file, it is read into the buffer, if not,
the cells are set to null-values. If the buffer corresponding to the pointer
- is used for writing, subsequent calls to <TT>G3d_getTilePtr</TT> may destroy the
- values already stored in the buffer. Use <TT>G3d_flushTile</TT> to write the buffer
+ is used for writing, subsequent calls to <TT>Rast3d_getTilePtr</TT> may destroy the
+ values already stored in the buffer. Use <TT>Rast3d_flushTile</TT> to write the buffer
to the file before reusing it for a different index. The use of this buffer
as write buffer is discouraged.
<BR>
@@ -917,8 +917,8 @@
Care has to be taken if this function is used in non-cache mode since it is
implicitly invoked every time a read or write request is issued. The only
I/O-functions for which it is safe to assume that they do not invoke
- <TT>G3d_getTilePtr</TT> are <TT>G3d_readTile()</TT> and
- <TT>G3d_writeTile()</TT> and their corresponding type-specific versions.
+ <TT>Rast3d_getTilePtr</TT> are <TT>Rast3d_readTile()</TT> and
+ <TT>Rast3d_writeTile()</TT> and their corresponding type-specific versions.
<P>
Returns
@@ -926,8 +926,8 @@
NULL ... otherwise.
<P>
-int G3d_tileLoad(void *map, int tileIndex)
-Same functionality as <TT>G3d_getTilePtr()</TT> but does not return the
+int Rast3d_tileLoad(void *map, int tileIndex)
+Same functionality as <TT>Rast3d_getTilePtr()</TT> but does not return the
pointer.
<P>
@@ -936,11 +936,11 @@
0 ... otherwise.
<P>
-int G3d_removeTile(void *map, inttileIndex) Removes a tile
+int Rast3d_removeTile(void *map, inttileIndex) Removes a tile
from memory-cache if tile is in memory-cache. For new maps the
application does not know whether the tile is in the memory-cache or in
the file-cache. Therefore, for new maps this function should be
- preceded by <TT>G3d_tileLoad()</TT>.
+ preceded by <TT>Rast3d_tileLoad()</TT>.
<P>
<EM>(Question: Is this a useful function?)</EM>
@@ -953,14 +953,14 @@
\subsection Write_Functions_used_in_Cache_Mode Write Functions used in Cache Mode
<P>
-int G3d_flushTile(void *map, int tileIndex) Writes the tile with
+int Rast3d_flushTile(void *map, int tileIndex) Writes the tile with
<EM>tileIndex</EM> to the file corresponding to <EM>map</EM> and removes the tile
from the cache (in non-cache mode the buffer provided by the map-structure is
written).
<P>
If this tile has already been written before the write request is ignored.
- If the tile was never referred to before the invokation of G3d_flushTile, a
+ If the tile was never referred to before the invokation of Rast3d_flushTile, a
tile filled with NULL-values is written.
<P>
@@ -969,7 +969,7 @@
0 ... otherwise.
<P>
-int G3d_flushTileCube(void *map, int xMin, int yMin, int zMin, int
+int Rast3d_flushTileCube(void *map, int xMin, int yMin, int zMin, int
xMax, int yMax, int zMax) Writes the tiles with tile-coordinates
contained in the axis-parallel cube with vertices <EM>(xMin, yMin, zMin)</EM>
and <EM>(xMax, yMax, zMax</EM>). Tiles which are not stored in the cache are
@@ -982,7 +982,7 @@
0 ... otherwise.
<P>
-int G3d_flushTilesInCube(void *map, int xMin, int yMin, int
+int Rast3d_flushTilesInCube(void *map, int xMin, int yMin, int
zMin, int xMax, int yMax, int zMax) Writes those tiles for which
<EM>every</EM> cell has coordinate contained in the axis-parallel cube
defined by the vertices with cell-coordinates <EM>(xMin, yMin, zMin)</EM>
@@ -1003,7 +1003,7 @@
\subsection Locking_and_Unlocking_Tiles_and_CyclesLocking and Unlocking Tiles, and Cycles
<P>
-int G3d_lockTile(void *map, int tileIndex) Locks tile with <EM>tileIndex</EM> in cache.
+int Rast3d_lockTile(void *map, int tileIndex) Locks tile with <EM>tileIndex</EM> in cache.
If after locking fewer than the minimum number of
unlocked tiles are unlocked, the lock request is ignored.
@@ -1014,7 +1014,7 @@
0 ... otherwise.
<P>
-int G3d_unlockTile(void *map, int tileIndex)
+int Rast3d_unlockTile(void *map, int tileIndex)
Unlocks tile with <EM>tileIndex</EM>.
<P>
@@ -1023,7 +1023,7 @@
0 ... otherwise.
<P>
-int G3d_unlockAll(void *map)
+int Rast3d_unlockAll(void *map)
Unlocks every tile in cache of <EM>map</EM>.
<P>
@@ -1032,28 +1032,28 @@
0 ... otherwise.
<P>
-void G3d_autolockOn(void *map)
+void Rast3d_autolockOn(void *map)
Turns autolock mode on.
<P>
-void G3d_autolockOff(void *map)
+void Rast3d_autolockOff(void *map)
Turns autolock mode Off.
<P>
-void G3d_minUnlocked(void *map, int minUnlocked) Sets the minimum
+void Rast3d_minUnlocked(void *map, int minUnlocked) Sets the minimum
number of unlocked tiles to <EM>minUnlocked</EM>. This function should be used
- in combination with <TT>G3d_unlockAll()</TT> in order to avoid situations where the
+ in combination with <TT>Rast3d_unlockAll()</TT> in order to avoid situations where the
new minimum is larger than the actual number of unlocked tiles.
<P>
<EM>minUnlocked</EM> must be one of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
- RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
+ RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of Rast3d_cacheSizeEncode()
(cf. Section 22.4.6), or any positive integer
which explicitly specifies the number of tiles.
<P>
-int G3d_beginCycle(void *map)
+int Rast3d_beginCycle(void *map)
Starts a new cycle.
<P>
@@ -1062,7 +1062,7 @@
0 ... otherwise.
<P>
-int G3d_endCycle(void *map)
+int Rast3d_endCycle(void *map)
Ends a cycle.
<P>
@@ -1071,7 +1071,7 @@
0 ... otherwise.
<P>
-int G3d_cacheSizeEncode(int cacheCode, int n) Returns a number
+int Rast3d_cacheSizeEncode(int cacheCode, int n) Returns a number
which encodes multiplicity <EM>n</EM> of <EM>cacheCode</EM>. This value can be used
to specify the size of the cache.
@@ -1099,7 +1099,7 @@
\subsection Reading_Volumes Reading Volumes
<P>
-int G3d_getVolume(void *map, double originNorth, double originWest,
+int Rast3d_getVolume(void *map, double originNorth, double originWest,
double originBottom, double vxNorth, double vxWest, double vxBottom, double
vyNorth, double vyWest, double vyBottom, double vzNorth, double vzWest,
double vzBottom, int nx, int ny, int nz, char *volumeBuf, int type)
@@ -1118,7 +1118,7 @@
Returns 1 ... if successful, 0 ... otherwise.
<P>
-int G3d_getAllignedVolume(void *map, double originNorth, double
+int Rast3d_getAllignedVolume(void *map, double originNorth, double
originWest, double originBottom, double lengthNorth, double lengthWest,
double lengthBottom, int nx, int ny, int nz, char *volumeBuf, int type)
Resamples the axis-parallel cube defined by <EM>origin</EM> and the lengths of
@@ -1134,9 +1134,9 @@
\subsection Allocating_and_Freeing_Memory Allocating and Freeing Memory
<P>
-void *G3d_malloc(int nBytes)
+void *Rast3d_malloc(int nBytes)
Same as <EM>malloc (nBytes)</EM>, except that in case of error
-<TT>G3d_error()</TT> is invoked.
+<TT>Rast3d_error()</TT> is invoked.
<P>
Returns
@@ -1144,9 +1144,9 @@
NULL ... otherwise.
<P>
-void *G3d_realloc(void *ptr, int nBytes)
+void *Rast3d_realloc(void *ptr, int nBytes)
Same as <EM>realloc (ptr, nBytes)</EM>, except that in case of error
-<TT>G3d_error()</TT> is invoked.
+<TT>Rast3d_error()</TT> is invoked.
<P>
Returns
@@ -1154,10 +1154,10 @@
NULL ... otherwise.
<P>
-void G3d_free(void *ptr) Same as <EM>free (ptr)</EM>.
+void Rast3d_free(void *ptr) Same as <EM>free (ptr)</EM>.
<P>
-char *G3d_allocTilesType(void *map, int nofTiles, int type)
+char *Rast3d_allocTilesType(void *map, int nofTiles, int type)
Allocates a vector of <EM>nofTiles</EM> tiles with the same dimensions
as the tiles of <EM>map</EM> and large enough to store cell-values of
<EM>type</EM>.
@@ -1168,80 +1168,80 @@
NULL ... otherwise.
<P>
-char *G3d_allocTiles(void *map, int nofTiles)
-Is equivalent to G3d_allocTilesType (map, nofTiles, G3d_fileTypeMap (map)).
+char *Rast3d_allocTiles(void *map, int nofTiles)
+Is equivalent to Rast3d_allocTilesType (map, nofTiles, Rast3d_fileTypeMap (map)).
<P>
-void G3d_freeTiles(char *tiles)
-Is equivalent to <TT>G3d_free (tiles);</TT>
+void Rast3d_freeTiles(char *tiles)
+Is equivalent to <TT>Rast3d_free (tiles);</TT>
<P>
\subsection RASTER3D_Null_Value_Support RASTER3D Null Value Support
<P>
-void G3d_isNullValueNum(void *n, int type)
+void Rast3d_isNullValueNum(void *n, int type)
Returns 1 if the value of <EM>*n</EM> is a NULL-value. Returns 0
otherwise.
<P>
-void G3d_setNullValue(void *c, int nofElts, int type)
+void Rast3d_setNullValue(void *c, int nofElts, int type)
Fills the vector pointed to by <EM>c</EM> with <EM>nofElts</EM> NULL-values
of <EM>type</EM>.
<P>
-void G3d_setNullTileType(void *map, int tile, int type)
+void Rast3d_setNullTileType(void *map, int tile, int type)
Assumes that <EM>tile</EM> is a tile with the same dimensions as the
tiles of <EM>map</EM>. Fills <EM>tile</EM> with NULL-values of
<EM>type</EM>.
<P>
-void G3d_setNullTile(void *map, int tile)
-Is equivalent to G3d_setNullTileType (map, tile, G3d_fileTypeMap (map)).
+void Rast3d_setNullTile(void *map, int tile)
+Is equivalent to Rast3d_setNullTileType (map, tile, Rast3d_fileTypeMap (map)).
<P>
\subsection RASTER3D_Map_Header_Information RASTER3D Map Header Information
<P>
-void G3d_getCoordsMap(void *map, int *rows, int *cols, int *depths)
+void Rast3d_getCoordsMap(void *map, int *rows, int *cols, int *depths)
Returns the size of the region of <EM>map</EM> in cells.
<P>
-void G3d_getRegionMap(void *map, int *north, int *south, int *east,
+void Rast3d_getRegionMap(void *map, int *north, int *south, int *east,
int *west, int *top, int *bottom)Returns the size of the region.
<P>
-void G3d_getRegionStructMap(void *map, RASTER3D_Region *region)
+void Rast3d_getRegionStructMap(void *map, RASTER3D_Region *region)
Returns in <EM>region</EM> the region of <EM>map</EM>.
<P>
-void G3d_getTileDimensionsMap(void *map, int *x, int *y, int *z)
+void Rast3d_getTileDimensionsMap(void *map, int *x, int *y, int *z)
Returns the tile dimensions used for <EM>map</EM>.
<P>
-void G3d_getNofTilesMap(void *map, int *nx, int *ny, int *nz)
+void Rast3d_getNofTilesMap(void *map, int *nx, int *ny, int *nz)
Returns the dimensions of the tile-cube used to tile the region of <EM>map</EM>.
These numbers include partial tiles.
<P>
-int G3d_tileTypeMap(void *map)
+int Rast3d_tileTypeMap(void *map)
Returns the type in which tiles of <EM>map</EM> are stored in memory.
<P>
-int G3d_fileTypeMap(void *map)
+int Rast3d_fileTypeMap(void *map)
Returns the type with which tiles of <EM>map</EM> are stored on file.
<P>
-int G3d_tilePrecisionMap(void *map)
+int Rast3d_tilePrecisionMap(void *map)
Returns the precision used to store <EM>map</EM>.
<P>
-int G3d_tileUseCacheMap(void *map)
+int Rast3d_tileUseCacheMap(void *map)
Returns 1 if <EM>map</EM> uses cache, returns 0 otherwise.
<P>
-void G3d_printHeader(void *map)
+void Rast3d_printHeader(void *map)
Prints the header information of <EM>map</EM>.
<P>
@@ -1249,65 +1249,65 @@
\subsection RASTER3D_Tile_Math RASTER3D Tile Math
<P>
-void G3d_tileIndex2tile(void *map, int tileIndex, int *xTile, int
+void Rast3d_tileIndex2tile(void *map, int tileIndex, int *xTile, int
*yTile, int *zTile) Converts index <EM>tileIndex</EM> into tile-coordinates
<EM>(xTile, yTile, zTile)</EM>.
<P>
-int G3d_tile2tileIndex(void *map, int xTile, int yTile, int
+int Rast3d_tile2tileIndex(void *map, int xTile, int yTile, int
zTile) Returns tile-index corresponding to tile-coordinates <EM>(xTile,
yTile, zTile)</EM>.
<P>
-void G3d_coord2tileCoord(void *map, int x, int y, int z, int *xTile,
+void Rast3d_coord2tileCoord(void *map, int x, int y, int z, int *xTile,
int *yTile, int *zTile, int *xOffs, int *yOffs, int *zOffs) Converts
cell-coordinates <EM>(x, y, z)</EM> into tile-coordinates <EM>(xTile, yTile,
zTile)</EM> and the coordinate of the cell <EM>(xOffs, yOffs, zOffs)</EM> within
the tile.
<P>
-void G3d_tileCoordOrigin(void *map, int xTile, int yTile, int zTile,
+void Rast3d_tileCoordOrigin(void *map, int xTile, int yTile, int zTile,
int *x, int *y, int *z) Computes the cell-coordinates <EM>(x, y, z)</EM>
which correspond to the origin of the tile with tile-coordinates <EM>(xTile,
yTile, zTile)</EM>.
<P>
-void G3d_tileIndexOrigin(void *map, int tileIndex, int *x, int *y,
+void Rast3d_tileIndexOrigin(void *map, int tileIndex, int *x, int *y,
int *z) Computes the cell-coordinates <EM>(x, y, z)</EM> which correspond to
the origin of the tile with <EM>tileIndex</EM>.
<P>
-void G3d_coord2tileIndex(void *map, int x, int y, int z, int
+void Rast3d_coord2tileIndex(void *map, int x, int y, int z, int
*tileIndex, int *offset) Converts cell-coordinates <EM>(x, y, z)</EM> into
<EM>tileIndex</EM> and the <EM>offset</EM> of the cell within the tile.
<P>
-int G3d_coordInRange(void *map, int x, int y, int z) Returns 1 if
+int Rast3d_coordInRange(void *map, int x, int y, int z) Returns 1 if
cell-coordinate <EM>(x, y, z)</EM> is a coordinate inside the region. Returns 0
otherwise.
<P>
-int G3d_tileInRange(void *map, int x, int y, int z) Returns 1 if
+int Rast3d_tileInRange(void *map, int x, int y, int z) Returns 1 if
tile-coordinate <EM>(x, y, z)</EM> is a coordinate inside tile cube. Returns 0
otherwise.
<P>
-int G3d_tileIndexInRange(void *map, int tileIndex)
+int Rast3d_tileIndexInRange(void *map, int tileIndex)
Returns 1 if <EM>tileIndex</EM> is a valid index for <EM>map</EM>.
Returns 0 otherwise.
<P>
-int G3d_isValidLocation(void *map, double north, double west, double
+int Rast3d_isValidLocation(void *map, double north, double west, double
bottom) Returns 1 if region-coordinates <EM>(north, west, bottom)</EM> are
inside the region of <EM>map</EM>. Returns 0 otherwise.
<P>
-void G3d_location2coord(void *map, double north, double west, double
+void Rast3d_location2coord(void *map, double north, double west, double
bottom, int *x, *y, *z) Converts region-coordinates <EM>(north, west,
bottom)</EM> into cell-coordinates <EM>(x, y, z)</EM>.
<P>
-int G3d_computeClippedTileDimensions(void *map, int tileIndex, int
+int Rast3d_computeClippedTileDimensions(void *map, int tileIndex, int
*rows, int *cols, int *depths, int *xRedundant, int *yRedundant, int
*zRedundant) Computes the dimensions of the tile when clipped to fit the
region of <EM>map</EM>. The clipped dimensions are returned in <EM>rows</EM>,
@@ -1323,13 +1323,13 @@
The map structure of RASTER3D provides storage for the range. The range of a map is
updated every time a cell is written to the file. When an old map is opened the
range is not automatically loaded. The application has to invoke
-<TT>G3d_range_load()</TT> (cf. Section 22.4.12)
+<TT>Rast3d_range_load()</TT> (cf. Section 22.4.12)
explicitly. In
addition to these function the application can also use the standard grass
functions to manipulate the range.
<P>
-int G3d_range_load(void *map)
+int Rast3d_range_load(void *map)
Loads the range into the range structure of <EM>map</EM>.
<P>
@@ -1338,12 +1338,12 @@
0 ... otherwise.
<P>
-void G3d_range_min_max(void *map, double *min, double *max)
+void Rast3d_range_min_max(void *map, double *min, double *max)
Returns in <EM>min</EM> and <EM>max</EM> the minimum and maximum values of
the range.
<P>
-int G3d_range_write(void *map)
+int Rast3d_range_write(void *map)
Writes the range which is stored in the range structure of <EM>map</EM>.
(This function is invoked automatically when a new file is closed).
@@ -1361,7 +1361,7 @@
for the file manipulations.
<P>
-int G3d_removeColor(char *name)
+int Rast3d_removeColor(char *name)
Removes the primary and/or secondary color file. See <EM>G_remove_colr</EM> for
details.
@@ -1369,13 +1369,13 @@
Returns always 0.
<P>
-int G3d_readColors(char *name, char *mapset, struct Colors
+int Rast3d_readColors(char *name, char *mapset, struct Colors
*colors) Reads color file for map <EM>name</EM> in <EM>mapset</EM> into the
<EM>colors</EM> structure. See <EM>G_read_colors</EM>
(Raster_Color_Table) for details and return values.
<P>
-int G3d_writeColors(char *name, char *mapset, struct Colors
+int Rast3d_writeColors(char *name, char *mapset, struct Colors
*colors)Writes colors stored in <EM>colors</EM> structure into the color
file for map <EM>name</EM> in <EM>mapset</EM>. See <EM>G_write_colors</EM>
(Raster_Color_Table) for
@@ -1390,13 +1390,13 @@
except for the file manipulations.
<P>
-int G3d_readCats(char *name, char *mapset, struct Categories *cats)
+int Rast3d_readCats(char *name, char *mapset, struct Categories *cats)
Reads the categories file for map <EM>name</EM> in <EM>mapset</EM> and
stores the categories in the <EM>cats</EM> structure. See <EM>G_read_cats</EM>
(Raster_Category_File) for details and return values.
<P>
-int G3d_writeCats(char *name, struct Categories *cats) Writes the
+int Rast3d_writeCats(char *name, struct Categories *cats) Writes the
categories stored in the <EM>cats</EM> structure into the categories file for
map <EM>name</EM> in the current mapset. See <EM>G_write_cats</EM>
(Raster_Category_File) for details and return values.
@@ -1411,13 +1411,13 @@
except for the file manipulations.
<P>
-int G3d_readHistory(char *name, char *mapset, struct History *hist)
+int Rast3d_readHistory(char *name, char *mapset, struct History *hist)
Reads the history file for map <EM>name</EM> in <EM>mapset</EM> and
stores the history in the <EM>hist</EM> structure. See <EM>G_read_history</EM>
(Raster_History_File) for details and return values.
<P>
-int G3d_writeHistory(char *name, struct History *hist)
+int Rast3d_writeHistory(char *name, struct History *hist)
Writes the
history stored in the <EM>hist</EM> structure into the categories file for
map <EM>name</EM> in the current mapset. See <EM>G_write_history</EM>
@@ -1428,21 +1428,21 @@
\subsection RASTER3D_Mask_Support RASTER3D Mask Support
<P>
-void G3d_maskOn(void *map) Turns on the mask for <EM>map</EM>. Do
+void Rast3d_maskOn(void *map) Turns on the mask for <EM>map</EM>. Do
not invoke this function after the first tile has been read since the result
might be inconsistent cell-values.
<P>
-void G3d_maskOff(void *map) Turns off the mask for <EM>map</EM>.
+void Rast3d_maskOff(void *map) Turns off the mask for <EM>map</EM>.
This is the default. Do not invoke this function after the first tile has
been read since the result might be inconsistent cell-values.
<P>
-int G3d_maskIsOn(void *map) Returns 1 if the mask for <EM>map</EM>
+int Rast3d_maskIsOn(void *map) Returns 1 if the mask for <EM>map</EM>
is turned on. Returns 0 otherwise.
<P>
-int G3d_maskIsOff(void *map)
+int Rast3d_maskIsOff(void *map)
Returns 1 if the mask for <EM>map</EM> is turned off. Returns 0 otherwise.
<P>
@@ -1452,7 +1452,7 @@
non-masked value of a cell has to be known.
<P>
-int G3d_maskReopen(int cache)
+int Rast3d_maskReopen(int cache)
This function should be used to adjust the cache size used for the
3d-mask. First the open 3d-mask is closed and then opened again with
a cache size as specified with <EM>cache</EM>.
@@ -1463,40 +1463,40 @@
0 ... otherwise.
<P>
-int G3d_maskFileExists() Returns 1 if the 3d mask file
+int Rast3d_maskFileExists() Returns 1 if the 3d mask file
exists.
<P>
-int G3d_maskMapExists()
+int Rast3d_maskMapExists()
Returns 1 if the 3d mask is loaded.
<P>
-char *G3d_maskFile()
+char *Rast3d_maskFile()
Returns the name of the 3d mask file.
<P>
-int G3d_isMasked(int x, int y, int z)
+int Rast3d_isMasked(int x, int y, int z)
Returns 1 if the cell with cell-coordinates <EM>(x, y, z)</EM> is masked
out. Returns 0 otherwise.
<P>
-void G3d_maskNum(int x, int y, int z, void *value, int type)
+void Rast3d_maskNum(int x, int y, int z, void *value, int type)
Replaces the value stored in <EM>value</EM> with the NULL-value if
-<EM>G3d_isMasked (x, y, z)</EM> returns 1. Does nothing otherwise.
+<EM>Rast3d_isMasked (x, y, z)</EM> returns 1. Does nothing otherwise.
<EM>value</EM> is assumed to be of<EM>type</EM>.
<P>
-void G3d_maskFloat(int x, int y, int z, float *value)
-Same as <EM>G3d_maskNum (x, y, z, value, FCELL_TYPE)</EM>.
+void Rast3d_maskFloat(int x, int y, int z, float *value)
+Same as <EM>Rast3d_maskNum (x, y, z, value, FCELL_TYPE)</EM>.
<P>
-void G3d_maskDouble(int x, int y, int z, double *value)
-Same as <EM>G3d_maskNum (x, y, z, value, DCELL_TYPE)</EM>.
+void Rast3d_maskDouble(int x, int y, int z, double *value)
+Same as <EM>Rast3d_maskNum (x, y, z, value, DCELL_TYPE)</EM>.
<P>
-void G3d_maskTile(void *map, int tileIndex, char *tile, int type)
+void Rast3d_maskTile(void *map, int tileIndex, char *tile, int type)
Replaces the values stored in <EM>tile</EM> (with <EM>tileIndex</EM>) for
-which <EM>G3d_isMasked</EM> returns 1 with NULL-values. Does not change
+which <EM>Rast3d_isMasked</EM> returns 1 with NULL-values. Does not change
the remaining values. The values are assumed to be of <EM>type</EM>.
Whether replacement is performed or not only depends on location of the
cells of the tile and not on the status of the mask for <EM>map</EM>
@@ -1507,27 +1507,27 @@
\subsection RASTER3D_Window_Support RASTER3D Window Support
<P>
-void G3d_setWindowMap(void *map, RASTER3D_Region *window)
+void Rast3d_setWindowMap(void *map, RASTER3D_Region *window)
Sets the window for <EM>map</EM> to <EM>window</EM>.
Can be used multiple times for the same map.
<P>
-void G3d_setWindow(RASTER3D_Region *window)
+void Rast3d_setWindow(RASTER3D_Region *window)
Sets the default window used for every map opened later in the program.
Can be used multiple times in the same program.
<P>
-void G3d_getWindow(RASTER3D_Region *window)
+void Rast3d_getWindow(RASTER3D_Region *window)
Stores the current default window in <EM>window</EM>.
<P>
-void *G3d_windowPtr()
+void *Rast3d_windowPtr()
Returns a pointer to the current default window. This pointer should not be
(ab)used to modify the current window structure directly. It is
provided to pass a window pointer when opening a map.
<P>
-int G3d_readWindow(RASTER3D_Region *window, char *windowName) Reads
+int Rast3d_readWindow(RASTER3D_Region *window, char *windowName) Reads
<EM>window</EM> from the file specified by <EM>windowName</EM>. The name is
converted by the rules defined in window defaults. A NULL pointer indicates
the <EM>WIND3</EM> file in the current mapset.
@@ -1538,7 +1538,7 @@
0 ... otherwise.
<P>
-int G3d_writeWindow(RASTER3D_Region *window, char *windowName)
+int Rast3d_writeWindow(RASTER3D_Region *window, char *windowName)
Writes <EM>window</EM> to the file specified by <EM>windowName</EM>. The name
is converted by the rules defined in window defaults. A NULL pointer
indicates the <EM>WIND3</EM> file in the current mapset.
@@ -1549,39 +1549,39 @@
0 ... otherwise.
<P>
-void G3d_useWindowParams()
+void Rast3d_useWindowParams()
Allows the window to be set at run-time via the <EM>region3</EM>
command line argument. This function has to be called before
<EM>G_parser()</EM>. See also
window defaults.
<P>
-void G3d_setResamplingFun(void *map, void (*resampleFun)())
+void Rast3d_setResamplingFun(void *map, void (*resampleFun)())
Sets the resampling function to be used by
-G3d_getValue() (cf. Section 22.4.3). This function is defined
+Rast3d_getValue() (cf. Section 22.4.3). This function is defined
as follows:
<P>
-void G3d_customResampleFun(void *map, int row, int col, int depth,
+void Rast3d_customResampleFun(void *map, int row, int col, int depth,
char *value, int type) <EM>row</EM>, <EM>col</EM>, and <EM>depth</EM> are in
region coordinates. The result is returned in <EM>value</EM> as <EM>type</EM> which
is one of FCELL_TYPE or DCELL_TYPE. Possible choices include
- G3d_nearestNeighbor() (cf. Section22.4.16) and
- G3d_getValueRegion() (cf. Section 22.4.3).
+ Rast3d_nearestNeighbor() (cf. Section22.4.16) and
+ Rast3d_getValueRegion() (cf. Section 22.4.3).
<P>
-void G3d_nearestNeighbor(void *map, int row, int col, int depth, char
+void Rast3d_nearestNeighbor(void *map, int row, int col, int depth, char
*value, int type) The default resampling function which uses nearest
neighbor resampling.
<P>
-void G3d_getResamplingFun(void *map, void (**resampleFun)())
+void Rast3d_getResamplingFun(void *map, void (**resampleFun)())
Returns in <EM>resampleFun</EM> a pointer to the resampling function used by
<EM>map</EM>.
<P>
-void G3d_getNearestNeighborFunPtr(void (**nnFunPtr)()) Returns
- in <EM>nnFunPtr</EM> a pointer to G3d_nearestNeighbor() (cf.
+void Rast3d_getNearestNeighborFunPtr(void (**nnFunPtr)()) Returns
+ in <EM>nnFunPtr</EM> a pointer to Rast3d_nearestNeighbor() (cf.
Section <A HREF="#g3d:G3d.nearestNeighbor">22.4.16</A>).
<P>
@@ -1589,39 +1589,39 @@
\subsection RASTER3D_Region RASTER3D Region
<P>
-void G3d_extract2dRegion(RASTER3D_Region *region3d, struct Cell_head
+void Rast3d_extract2dRegion(RASTER3D_Region *region3d, struct Cell_head
*region2d) Returns in <EM>region2d</EM> the <EM>2d</EM> portion of <EM>region3d</EM>.
<P>
-void G3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region
+void Rast3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region
*region3d) Replaces the <EM>2d</EM> portion of <EM>region3d</EM> with the
values stored in <EM>region2d</EM>.
<P>
-void G3d_adjustRegion(RASTER3D_Region *region)
+void Rast3d_adjustRegion(RASTER3D_Region *region)
Computes an adjusts the resolutions in the region structure from the region
boundaries and number of cells per dimension.
<P>
-void G3d_adjustRegionRes(RASTER3D_Region *region)
+void Rast3d_adjustRegionRes(RASTER3D_Region *region)
Computes an adjusts the number of cells per dimension in the region
structure from the region boundaries and resolutions.
<P>
-void G3d_regionCopy(RASTER3D_Region *regionDest, RASTER3D_Region *regionSrc)
+void Rast3d_regionCopy(RASTER3D_Region *regionDest, RASTER3D_Region *regionSrc)
Copies the values of <EM>regionSrc</EM> into <EM>regionDst</EM>.
(The unfortunate order of parameters was chosen in order to conform to the
order used in <EM>G_copy()</EM>).
<P>
-void G3d_getRegionValue(void *map, double north, double east, double
+void Rast3d_getRegionValue(void *map, double north, double east, double
top, char *value, int type) Returns in <EM>value</EM> the value of the <EM>map</EM>
which corresponds to region coordinates <EM>(north, east, top)</EM>. The
value is resampled using the resampling function specified for <EM>map</EM>. The
<EM>value</EM> is of <EM>type</EM>.
<P>
-void G3d_readRegionMap(char *name, char *mapset, RASTER3D_Region *region)
+void Rast3d_readRegionMap(char *name, char *mapset, RASTER3D_Region *region)
Returns in <EM>region</EM> the region information for 3d cell <EM>name at mapset</EM>.
<P>
@@ -1629,17 +1629,17 @@
\subsection Miscellaneous_Functions Miscellaneous Functions
<P>
-void G3d_g3dType2cellType(int g3dType) Returns the GRASS floating
+void Rast3d_g3dType2cellType(int g3dType) Returns the GRASS floating
point type which is equivalent to the RASTER3D type of <EM>g3dType</EM>.
<P>
-void G3d_initDefaults() Initializes the default values described
+void Rast3d_initDefaults() Initializes the default values described
in RASTER3D Defaults. Applications have to use this function only if they need to
query the default values before the first file (either old or new) has been
opened.
<P>
-void G3d_setStandard3dInputParams()
+void Rast3d_setStandard3dInputParams()
Initializes a parameter
structure for the subset of command line arguments which lets the user
overwrite the default properties of the new file. Applications are
@@ -1651,11 +1651,11 @@
<P>
This function has to be used in conjunction with
- G3d_getStandard3dInputParams() (cf.
+ Rast3d_getStandard3dInputParams() (cf.
Section 22.4.18).
<P>
-int G3d_getStandard3dInputParams(int *useTypeDefault, *type, *useLzwDefault, *doLzw,
+int Rast3d_getStandard3dInputParams(int *useTypeDefault, *type, *useLzwDefault, *doLzw,
int *useRleDefault, *doRle, *usePrecisionDefault, *precision,
int *useDimensionDefault, *tileX, *tileY, *tileZ
Returns the properties of the new file as chosen by the user via command
@@ -1667,7 +1667,7 @@
<P>
Function
-G3d_setStandard3dInputParams() (cf. Section 22.4.18)
+Rast3d_setStandard3dInputParams() (cf. Section 22.4.18)
has to be used to initialize the internal parameter structure.
<P>
@@ -1676,11 +1676,11 @@
0 ... otherwise.
<P>
-int G3d_makeMapsetMapDirectory(char *mapName)
+int Rast3d_makeMapsetMapDirectory(char *mapName)
Creates the 3d mapset element for map <EM>mapName</EM>.
<P>
-int G3d_filename(char *path, *elementName, *mapName, *mapset)
+int Rast3d_filename(char *path, *elementName, *mapName, *mapset)
Returns in <EM>path</EM> the path for element <EM>elementName</EM> for map
<EM>mapName</EM> in <EM>mapset</EM>. Note, an error occurs if <EM>mapName</EM>
is fully qualified.
@@ -1700,7 +1700,7 @@
GRASS 7 source code in lib/g3d/.
<P>
-void G3d_retile(void *map, char *nameOut, int tileX, int tileY, int tileZ)
+void Rast3d_retile(void *map, char *nameOut, int tileX, int tileY, int tileZ)
Makes a copy of <EM>map</EM> with name <EM>nameOut</EM> which has
tile dimensions <EM>tileX</EM>, <EM>tileY</EM>, <EM>tileZ</EM>.
@@ -1708,7 +1708,7 @@
The source code can be found in <EM>retile.c</EM>.
<P>
-void G3d_changePrecision(void *map, int precision, char *nameOut)
+void Rast3d_changePrecision(void *map, int precision, char *nameOut)
Makes a copy of <EM>map</EM> with name <EM>nameOut</EM> which is
written with <EM>precision</EM>.
@@ -1716,7 +1716,7 @@
The source code can be found in <EM>changeprecision.c</EM>.
<P>
-void G3d_changeType(void *map, char *nameOut)
+void Rast3d_changeType(void *map, char *nameOut)
Makes a copy of <EM>map</EM> with name <EM>nameOut</EM> in which the
cells are of type FCELL_TYPE if they are DCELL_TYPE in <EM>map</EM>,
and in DCELL_TYPE otherwise.
@@ -1725,7 +1725,7 @@
The source code can be found in <EM>changetype.c</EM>.
<P>
-void G3d_compareFiles(char *f1, char *mapset1, char *f2, char *mapset2)
+void Rast3d_compareFiles(char *f1, char *mapset1, char *f2, char *mapset2)
Compares the cell-values of file <EM>f1</EM> in mapset
<EM>mapset1</EM> and file <EM>f2</EM> in mapset <EM>mapset2</EM>.
The values are compared up to precision.
@@ -1736,7 +1736,7 @@
The source code can be found in <EM>filecompare.c</EM>.
<P>
-void G3d_getBlock(void *map, int x0, int y0, int z0, int nx, int ny,
+void Rast3d_getBlock(void *map, int x0, int y0, int z0, int nx, int ny,
int nz, char *block, int type)
Copies the cells contained in the block (cube) with vertices
<EM>(x0, y0, z0)</EM> and <EM>(x0 + nx - 1, y0 + ny - 1, z0 + nz - 1)</EM>
@@ -1746,7 +1746,7 @@
The source code can be found in <EM>getblock.c</EM>.
<P>
-void G3d_writeAscii(void *map, char *fname)
+void Rast3d_writeAscii(void *map, char *fname)
Writes the cell-values of <EM>map</EM> in ascii format to file
<EM>fname</EM>. The values are organized by horizontal slices.
Modified: grass/trunk/lib/raster3d/long.c
===================================================================
--- grass/trunk/lib/raster3d/long.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/long.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -2,7 +2,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_longEncode(long *source, unsigned char *dst, int nofNums)
+int Rast3d_longEncode(long *source, unsigned char *dst, int nofNums)
{
long *src, d;
int eltLength, nBytes;
@@ -33,7 +33,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_longDecode(unsigned char *source, long *dst, int nofNums, int longNbytes)
+Rast3d_longDecode(unsigned char *source, long *dst, int nofNums, int longNbytes)
{
long *dest;
int eltLength;
@@ -50,7 +50,7 @@
while (source != srcStop) {
*dest = *source--;
if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0))
- G3d_fatalError("G3d_longDecode: decoded long too long");
+ Rast3d_fatalError("Rast3d_longDecode: decoded long too long");
dest--;
}
@@ -62,7 +62,7 @@
*dest *= 256;
*dest += *source--;
if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0))
- G3d_fatalError("G3d_longDecode: decoded long too long");
+ Rast3d_fatalError("Rast3d_longDecode: decoded long too long");
dest--;
}
}
Modified: grass/trunk/lib/raster3d/mapset.c
===================================================================
--- grass/trunk/lib/raster3d/mapset.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/mapset.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -6,7 +6,7 @@
/*---------------------------------------------------------------------------*/
-void G3d_makeMapsetMapDirectory(const char *mapName)
+void Rast3d_makeMapsetMapDirectory(const char *mapName)
{
char buf[GNAME_MAX + sizeof(RASTER3D_DIRECTORY) + 2];
Modified: grass/trunk/lib/raster3d/mask.c
===================================================================
--- grass/trunk/lib/raster3d/mask.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/mask.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,8 +12,8 @@
/*--------------------------------------------------------------------------*/
-static int G3d_maskMapExistsVar = 0;
-static RASTER3D_Map *G3d_maskMap;
+static int Rast3d_maskMapExistsVar = 0;
+static RASTER3D_Map *Rast3d_maskMap;
/*--------------------------------------------------------------------------*/
static void dummy(void)
@@ -24,25 +24,25 @@
static float RASTER3D_MASKNUMmaskValue;
-/* Call to dummy() to match void return type of G3d_setNullValue() */
+/* Call to dummy() to match void return type of Rast3d_setNullValue() */
#define RASTER3D_MASKNUM(map,Xmask,Ymask,Zmask,VALUEmask,TYPEmask) \
\
- (RASTER3D_MASKNUMmaskValue = G3d_getMaskFloat (map, Xmask, Ymask, Zmask), \
- ((G3d_isNullValueNum (&RASTER3D_MASKNUMmaskValue, FCELL_TYPE)) ? \
- G3d_setNullValue (VALUEmask, 1, TYPEmask) : dummy()))
+ (RASTER3D_MASKNUMmaskValue = Rast3d_getMaskFloat (map, Xmask, Ymask, Zmask), \
+ ((Rast3d_isNullValueNum (&RASTER3D_MASKNUMmaskValue, FCELL_TYPE)) ? \
+ Rast3d_setNullValue (VALUEmask, 1, TYPEmask) : dummy()))
/*--------------------------------------------------------------------------*/
-int G3d_maskClose()
+int Rast3d_maskClose()
{
/* No Idea if this is correct return value */
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return 1;
- G3d_maskMapExistsVar = 0;
+ Rast3d_maskMapExistsVar = 0;
- if (!G3d_closeCell(G3d_maskMap)) {
- G3d_error("G3d_maskClose: error closing mask");
+ if (!Rast3d_closeCell(Rast3d_maskMap)) {
+ Rast3d_error("Rast3d_maskClose: error closing mask");
return 0;
}
@@ -61,7 +61,7 @@
* \return int
*/
-int G3d_maskFileExists(void)
+int Rast3d_maskFileExists(void)
{
return G_find_file_misc(RASTER3D_DIRECTORY, RASTER3D_CELL_ELEMENT, RASTER3D_MASK_MAP, G_mapset()) != NULL;
}
@@ -70,37 +70,37 @@
static int maskOpenOldCacheDefault = RASTER3D_USE_CACHE_DEFAULT;
-int G3d_maskOpenOld(void)
+int Rast3d_maskOpenOld(void)
{
RASTER3D_Region region;
/* No Idea if this is correct return value */
- if (G3d_maskMapExistsVar)
+ if (Rast3d_maskMapExistsVar)
return 1;
- G3d_maskMapExistsVar = G3d_maskFileExists();
+ Rast3d_maskMapExistsVar = Rast3d_maskFileExists();
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return 1;
- if ((G3d_maskMap = G3d_openCellOld(RASTER3D_MASK_MAP, G_mapset(),
+ if ((Rast3d_maskMap = Rast3d_openCellOld(RASTER3D_MASK_MAP, G_mapset(),
RASTER3D_DEFAULT_WINDOW, FCELL_TYPE,
maskOpenOldCacheDefault))
== NULL) {
- G3d_error("G3d_maskOpenOld: cannot open mask");
+ Rast3d_error("Rast3d_maskOpenOld: cannot open mask");
return 0;
}
- G3d_getRegionStructMap(G3d_maskMap, ®ion);
- G3d_setWindowMap(G3d_maskMap, ®ion);
+ Rast3d_getRegionStructMap(Rast3d_maskMap, ®ion);
+ Rast3d_setWindowMap(Rast3d_maskMap, ®ion);
return 1;
}
/*--------------------------------------------------------------------------*/
-static float G3d_getMaskFloat(RASTER3D_Map * map, int x, int y, int z)
+static float Rast3d_getMaskFloat(RASTER3D_Map * map, int x, int y, int z)
{
double north, east, top;
float value;
@@ -112,7 +112,7 @@
top = ((double)z + 0.5) / (double)map->window.depths *
(map->window.top - map->window.bottom) + map->window.bottom;
- G3d_getRegionValue(G3d_maskMap, north, east, top, &value, FCELL_TYPE);
+ Rast3d_getRegionValue(Rast3d_maskMap, north, east, top, &value, FCELL_TYPE);
return value;
}
@@ -131,13 +131,13 @@
* 0 ... otherwise.
*/
-int G3d_maskReopen(int cache)
+int Rast3d_maskReopen(int cache)
{
int tmp;
- if (G3d_maskMapExistsVar)
- if (!G3d_maskClose()) {
- G3d_error("G3d_maskReopen: error closing mask");
+ if (Rast3d_maskMapExistsVar)
+ if (!Rast3d_maskClose()) {
+ Rast3d_error("Rast3d_maskReopen: error closing mask");
return 0;
}
@@ -145,8 +145,8 @@
tmp = maskOpenOldCacheDefault;
maskOpenOldCacheDefault = cache;
- if (!G3d_maskOpenOld()) {
- G3d_error("G3d_maskReopen: error opening mask");
+ if (!Rast3d_maskOpenOld()) {
+ Rast3d_error("Rast3d_maskReopen: error opening mask");
return 0;
}
@@ -170,13 +170,13 @@
* \return int
*/
-int G3d_isMasked(RASTER3D_Map * map, int x, int y, int z)
+int Rast3d_isMasked(RASTER3D_Map * map, int x, int y, int z)
{
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return 0;
- RASTER3D_MASKNUMmaskValue = G3d_getMaskFloat(map, x, y, z);
- return (G3d_isNullValueNum(&RASTER3D_MASKNUMmaskValue, FCELL_TYPE));
+ RASTER3D_MASKNUMmaskValue = Rast3d_getMaskFloat(map, x, y, z);
+ return (Rast3d_isNullValueNum(&RASTER3D_MASKNUMmaskValue, FCELL_TYPE));
}
/*--------------------------------------------------------------------------*/
@@ -186,7 +186,7 @@
* \brief
*
* Replaces the value stored in <em>value</em> with the NULL-value if
- * <em>G3d_isMasked (x, y, z)</em> returns 1. Does nothing otherwise.
+ * <em>Rast3d_isMasked (x, y, z)</em> returns 1. Does nothing otherwise.
* <em>value</em> is assumed to be of<em>type</em>.
*
* \param x
@@ -197,9 +197,9 @@
* \return void
*/
-void G3d_maskNum(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
+void Rast3d_maskNum(RASTER3D_Map * map, int x, int y, int z, void *value, int type)
{
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return;
RASTER3D_MASKNUM(map, x, y, z, value, type);
}
@@ -210,7 +210,7 @@
/*!
* \brief
*
- * Same as <em>G3d_maskNum (x, y, z, value, FCELL_TYPE)</em>.
+ * Same as <em>Rast3d_maskNum (x, y, z, value, FCELL_TYPE)</em>.
*
* \param x
* \param y
@@ -219,9 +219,9 @@
* \return void
*/
-void G3d_maskFloat(RASTER3D_Map * map, int x, int y, int z, float *value)
+void Rast3d_maskFloat(RASTER3D_Map * map, int x, int y, int z, float *value)
{
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return;
RASTER3D_MASKNUM(map, x, y, z, value, FCELL_TYPE);
}
@@ -232,7 +232,7 @@
/*!
* \brief
*
- * Same as <em>G3d_maskNum (x, y, z, value, DCELL_TYPE)</em>.
+ * Same as <em>Rast3d_maskNum (x, y, z, value, DCELL_TYPE)</em>.
*
* \param x
* \param y
@@ -241,9 +241,9 @@
* \return void
*/
-void G3d_maskDouble(RASTER3D_Map * map, int x, int y, int z, double *value)
+void Rast3d_maskDouble(RASTER3D_Map * map, int x, int y, int z, double *value)
{
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return;
RASTER3D_MASKNUM(map, x, y, z, value, DCELL_TYPE);
}
@@ -255,7 +255,7 @@
* \brief
*
* Replaces the values stored in <em>tile</em> (with <em>tileIndex</em>) for
- * which <em>G3d_isMasked</em> returns 1 with NULL-values. Does not change
+ * which <em>Rast3d_isMasked</em> returns 1 with NULL-values. Does not change
* the remaining values. The values are assumed to be of <em>type</em>.
* Whether replacement is performed or not only depends on location of the
* cells of the tile and not on the status of the mask for <em>map</em>
@@ -268,29 +268,29 @@
* \return void
*/
-void G3d_maskTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
+void Rast3d_maskTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
{
int nofNum, rows, cols, depths, xRedundant, yRedundant, zRedundant;
int x, y, z, xLength, yLength, dx, dy, dz, length;
- if (!G3d_maskMapExistsVar)
+ if (!Rast3d_maskMapExistsVar)
return;
- nofNum = G3d_computeClippedTileDimensions(map, tileIndex,
+ nofNum = Rast3d_computeClippedTileDimensions(map, tileIndex,
&rows, &cols, &depths,
&xRedundant, &yRedundant,
&zRedundant);
- G3d_tileIndexOrigin(map, tileIndex, &x, &y, &z);
+ Rast3d_tileIndexOrigin(map, tileIndex, &x, &y, &z);
if (nofNum == map->tileSize) {
/*AV*/
/* BEGIN OF ORIGINAL CODE */
/*
- * G3d_getTileDimensionsMap (map, &rows, &cols, &depths);
+ * Rast3d_getTileDimensionsMap (map, &rows, &cols, &depths);
*/
/*AV*/
/* BEGIN OF MY CODE */
- G3d_getTileDimensionsMap(map, &cols, &rows, &depths);
+ Rast3d_getTileDimensionsMap(map, &cols, &rows, &depths);
/* END OF MY CODE */
xRedundant = yRedundant = 0;
}
@@ -298,7 +298,7 @@
rows += y;
cols += x;
depths += z;
- length = G3d_length(type);
+ length = Rast3d_length(type);
xLength = xRedundant * length;
yLength = map->tileX * yRedundant * length;
@@ -329,7 +329,7 @@
* \return void
*/
-void G3d_maskOn(RASTER3D_Map * map)
+void Rast3d_maskOn(RASTER3D_Map * map)
{
map->useMask = 1;
}
@@ -346,7 +346,7 @@
* \return void
*/
-void G3d_maskOff(RASTER3D_Map * map)
+void Rast3d_maskOff(RASTER3D_Map * map)
{
map->useMask = 0;
}
@@ -362,7 +362,7 @@
* \return int
*/
-int G3d_maskIsOn(RASTER3D_Map * map)
+int Rast3d_maskIsOn(RASTER3D_Map * map)
{
return map->useMask;
}
@@ -377,7 +377,7 @@
* \return int
*/
-int G3d_maskIsOff(RASTER3D_Map * map)
+int Rast3d_maskIsOff(RASTER3D_Map * map)
{
return !map->useMask;
}
@@ -391,7 +391,7 @@
* \return char *
*/
-const char *G3d_maskFile(void)
+const char *Rast3d_maskFile(void)
{
return RASTER3D_MASK_MAP;
}
@@ -405,7 +405,7 @@
* \return int
*/
-int G3d_maskMapExists(void)
+int Rast3d_maskMapExists(void)
{
- return G3d_maskMapExistsVar;
+ return Rast3d_maskMapExistsVar;
}
Modified: grass/trunk/lib/raster3d/maskfn.c
===================================================================
--- grass/trunk/lib/raster3d/maskfn.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/maskfn.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -43,20 +43,20 @@
d_mask->list = I;
}
-int G3d_mask_d_select(DCELL * x, d_Mask * mask)
+int Rast3d_mask_d_select(DCELL * x, d_Mask * mask)
{
d_Interval *I;
if (mask->list == NULL)
return 0;
for (I = mask->list; I; I = I->next) {
- if (G3d_mask_match_d_interval(*x, I))
+ if (Rast3d_mask_match_d_interval(*x, I))
return 1;
}
return 0;
}
-DCELL G3d_mask_match_d_interval(DCELL x, d_Interval * I)
+DCELL Rast3d_mask_match_d_interval(DCELL x, d_Interval * I)
{
if (I->inf < 0)
return x <= I->low;
@@ -98,7 +98,7 @@
}
}
-void G3d_parse_vallist(char **vallist, d_Mask ** d_mask)
+void Rast3d_parse_vallist(char **vallist, d_Mask ** d_mask)
{
char buf[1024];
char x[2];
Modified: grass/trunk/lib/raster3d/misc.c
===================================================================
--- grass/trunk/lib/raster3d/misc.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/misc.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,7 +12,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_g3dType2cellType(int g3dType)
+int Rast3d_g3dType2cellType(int g3dType)
{
if (g3dType == FCELL_TYPE)
return FCELL_TYPE;
@@ -22,7 +22,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_copyFloat2Double(const float *src, int offsSrc, double *dst, int offsDst,
+Rast3d_copyFloat2Double(const float *src, int offsSrc, double *dst, int offsDst,
int nElts)
{
int i;
@@ -37,7 +37,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_copyDouble2Float(const double *src, int offsSrc, float *dst, int offsDst,
+Rast3d_copyDouble2Float(const double *src, int offsSrc, float *dst, int offsDst,
int nElts)
{
int i;
@@ -52,22 +52,22 @@
/*---------------------------------------------------------------------------*/
void
-G3d_copyValues(const void *src, int offsSrc, int typeSrc, void *dst,
+Rast3d_copyValues(const void *src, int offsSrc, int typeSrc, void *dst,
int offsDst, int typeDst, int nElts)
{
int eltLength;
if ((typeSrc == FCELL_TYPE) && (typeDst == DCELL_TYPE)) {
- G3d_copyFloat2Double(src, offsSrc, dst, offsDst, nElts);
+ Rast3d_copyFloat2Double(src, offsSrc, dst, offsDst, nElts);
return;
}
if ((typeSrc == DCELL_TYPE) && (typeDst == FCELL_TYPE)) {
- G3d_copyDouble2Float(src, offsSrc, dst, offsDst, nElts);
+ Rast3d_copyDouble2Float(src, offsSrc, dst, offsDst, nElts);
return;
}
- eltLength = G3d_length(typeSrc);
+ eltLength = Rast3d_length(typeSrc);
src = G_incr_void_ptr(src, eltLength * offsSrc);
dst = G_incr_void_ptr(dst, eltLength * offsDst);
@@ -77,10 +77,10 @@
/*---------------------------------------------------------------------------*/
-int G3d_length(int t)
+int Rast3d_length(int t)
{
if (!RASTER3D_IS_CORRECT_TYPE(t))
- G3d_fatalError("G3d_length: invalid type");
+ Rast3d_fatalError("Rast3d_length: invalid type");
if (t == FCELL_TYPE)
return sizeof(FCELL);
@@ -89,10 +89,10 @@
return 0;
}
-int G3d_externLength(int t)
+int Rast3d_externLength(int t)
{
if (!RASTER3D_IS_CORRECT_TYPE(t))
- G3d_fatalError("G3d_externLength: invalid type");
+ Rast3d_fatalError("Rast3d_externLength: invalid type");
if (t == FCELL_TYPE)
return RASTER3D_XDR_FLOAT_LENGTH;
Modified: grass/trunk/lib/raster3d/null.c
===================================================================
--- grass/trunk/lib/raster3d/null.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/null.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -9,7 +9,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_isNullValueNum(const void *n, int type)
+int Rast3d_isNullValueNum(const void *n, int type)
{
if (type == FCELL_TYPE)
return Rast_is_f_null_value(n);
@@ -32,7 +32,7 @@
* \return void
*/
-void G3d_setNullValue(void *c, int nofElts, int type)
+void Rast3d_setNullValue(void *c, int nofElts, int type)
{
if (type == FCELL_TYPE) {
Rast_set_f_null_value((float *)c, nofElts);
Modified: grass/trunk/lib/raster3d/open.c
===================================================================
--- grass/trunk/lib/raster3d/open.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/open.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -9,21 +9,21 @@
/*---------------------------------------------------------------------------*/
-void *G3d_openCellOldNoHeader(const char *name, const char *mapset)
+void *Rast3d_openCellOldNoHeader(const char *name, const char *mapset)
{
RASTER3D_Map *map;
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- G3d_initDefaults();
+ Rast3d_initDefaults();
- if (!G3d_maskOpenOld()) {
- G3d_error(_("G3d_openCellOldNoHeader: error in G3d_maskOpenOld"));
+ if (!Rast3d_maskOpenOld()) {
+ Rast3d_error(_("Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"));
return (void *)NULL;
}
- map = G3d_malloc(sizeof(RASTER3D_Map));
+ map = Rast3d_malloc(sizeof(RASTER3D_Map));
if (map == NULL) {
- G3d_error(_("G3d_openCellOldNoHeader: error in G3d_malloc"));
+ Rast3d_error(_("Rast3d_openCellOldNoHeader: error in Rast3d_malloc"));
return (void *)NULL;
}
@@ -34,12 +34,12 @@
map->data_fd = G_open_old_misc(RASTER3D_DIRECTORY, RASTER3D_CELL_ELEMENT, xname, xmapset);
if (map->data_fd < 0) {
- G3d_error(_("G3d_openCellOldNoHeader: error in G_open_old"));
+ Rast3d_error(_("Rast3d_openCellOldNoHeader: error in G_open_old"));
return (void *)NULL;
}
- G3d_range_init(map);
- G3d_maskOff(map);
+ Rast3d_range_init(map);
+ Rast3d_maskOff(map);
return map;
}
@@ -56,13 +56,13 @@
* cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
* RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
* RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt> (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>Rast3d_cacheSizeEncode ()</tt> (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
* specifies the number of tiles buffered in the cache. <em>window</em> sets the
* window-region for the map. It is either a pointer to a window structure or
* RASTER3D_DEFAULT_WINDOW, which uses the window stored at initialization time or
- * set via <tt>G3d_setWindow ()</tt> (cf.{g3d:G3d.setWindow}).
+ * set via <tt>Rast3d_setWindow ()</tt> (cf.{g3d:G3d.setWindow}).
* To modify the window for the map after it has already been opened use
- * <tt>G3d_setWindowMap ()</tt> (cf.{g3d:G3d.setWindowMap}).
+ * <tt>Rast3d_setWindowMap ()</tt> (cf.{g3d:G3d.setWindowMap}).
* Returns a pointer to the cell structure ... if successful, NULL ...
* otherwise.
*
@@ -74,7 +74,7 @@
* \return void *
*/
-void *G3d_openCellOld(const char *name, const char *mapset,
+void *Rast3d_openCellOld(const char *name, const char *mapset,
RASTER3D_Region * window, int typeIntern, int cache)
{
RASTER3D_Map *map;
@@ -86,18 +86,18 @@
char *ltmp, *unit;
double north, south, east, west, top, bottom;
- map = G3d_openCellOldNoHeader(name, mapset);
+ map = Rast3d_openCellOldNoHeader(name, mapset);
if (map == NULL) {
- G3d_error(_("G3d_openCellOld: error in G3d_openCellOldNoHeader"));
+ Rast3d_error(_("Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"));
return (void *)NULL;
}
if (lseek(map->data_fd, (long)0, SEEK_SET) == -1) {
- G3d_error(_("G3d_openCellOld: can't rewind file"));
+ Rast3d_error(_("Rast3d_openCellOld: can't rewind file"));
return (void *)NULL;
}
- if (!G3d_readHeader(map,
+ if (!Rast3d_readHeader(map,
&proj, &zone,
&north, &south, &east, &west, &top, &bottom,
&rows, &cols, &depths,
@@ -105,19 +105,19 @@
&tileX, &tileY, &tileZ,
&type, &compression, &useRle, &useLzw,
&precision, &dataOffset, &useXdr, &hasIndex, &unit)) {
- G3d_error(_("G3d_openCellOld: error in G3d_readHeader"));
+ Rast3d_error(_("Rast3d_openCellOld: error in Rast3d_readHeader"));
return 0;
}
if (window == RASTER3D_DEFAULT_WINDOW)
- window = G3d_windowPtr();
+ window = Rast3d_windowPtr();
if (proj != window->proj) {
- G3d_error(_("G3d_openCellOld: projection does not match window projection"));
+ Rast3d_error(_("Rast3d_openCellOld: projection does not match window projection"));
return (void *)NULL;
}
if (zone != window->zone) {
- G3d_error(_("G3d_openCellOld: zone does not match window zone"));
+ Rast3d_error(_("Rast3d_openCellOld: zone does not match window zone"));
return (void *)NULL;
}
@@ -125,32 +125,32 @@
if (hasIndex) {
/* see RASTER3D_openCell_new () for format of header */
- if ((!G3d_readInts(map->data_fd, map->useXdr,
+ if ((!Rast3d_readInts(map->data_fd, map->useXdr,
&(map->indexLongNbytes), 1)) ||
- (!G3d_readInts(map->data_fd, map->useXdr,
+ (!Rast3d_readInts(map->data_fd, map->useXdr,
&(map->indexNbytesUsed), 1))) {
- G3d_error(_("G3d_openCellOld: can't read header"));
+ Rast3d_error(_("Rast3d_openCellOld: can't read header"));
return (void *)NULL;
}
/* if our long is to short to store offsets we can't read the file */
if (map->indexNbytesUsed > sizeof(long))
- G3d_fatalError(_("G3d_openCellOld: index does not fit into long"));
+ Rast3d_fatalError(_("Rast3d_openCellOld: index does not fit into long"));
- ltmp = G3d_malloc(map->indexLongNbytes);
+ ltmp = Rast3d_malloc(map->indexLongNbytes);
if (ltmp == NULL) {
- G3d_error(_("G3d_openCellOld: error in G3d_malloc"));
+ Rast3d_error(_("Rast3d_openCellOld: error in Rast3d_malloc"));
return (void *)NULL;
}
/* convert file long to long */
if (read(map->data_fd, ltmp, map->indexLongNbytes) !=
map->indexLongNbytes) {
- G3d_error(_("G3d_openCellOld: can't read header"));
+ Rast3d_error(_("Rast3d_openCellOld: can't read header"));
return (void *)NULL;
}
- G3d_longDecode(ltmp, &(map->indexOffset), 1, map->indexLongNbytes);
- G3d_free(ltmp);
+ Rast3d_longDecode(ltmp, &(map->indexOffset), 1, map->indexLongNbytes);
+ Rast3d_free(ltmp);
}
nofHeaderBytes = dataOffset;
@@ -158,20 +158,20 @@
if (typeIntern == RASTER3D_TILE_SAME_AS_FILE)
typeIntern = type;
- if (!G3d_fillHeader(map, RASTER3D_READ_DATA, compression, useRle, useLzw,
+ if (!Rast3d_fillHeader(map, RASTER3D_READ_DATA, compression, useRle, useLzw,
type, precision, cache,
hasIndex, map->useXdr, typeIntern,
nofHeaderBytes, tileX, tileY, tileZ,
proj, zone,
north, south, east, west, top, bottom,
rows, cols, depths, ew_res, ns_res, tb_res, unit)) {
- G3d_error(_("G3d_openCellOld: error in G3d_fillHeader"));
+ Rast3d_error(_("Rast3d_openCellOld: error in Rast3d_fillHeader"));
return (void *)NULL;
}
- G3d_regionCopy(&(map->window), window);
- G3d_adjustRegion(&(map->window));
- G3d_getNearestNeighborFunPtr(&(map->resampleFun));
+ Rast3d_regionCopy(&(map->window), window);
+ Rast3d_adjustRegion(&(map->window));
+ Rast3d_getNearestNeighborFunPtr(&(map->resampleFun));
return map;
}
@@ -188,7 +188,7 @@
* cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
* RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
* RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>Rast3d_cacheSizeEncode ()</tt>
* (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
* specifies the number of tiles buffered in the cache. <em>region</em> specifies
* the 3d region.
@@ -202,7 +202,7 @@
* \return void *
*/
-void *G3d_openCellNew(const char *name, int typeIntern, int cache,
+void *Rast3d_openCellNew(const char *name, int typeIntern, int cache,
RASTER3D_Region * region)
{
RASTER3D_Map *map;
@@ -210,18 +210,18 @@
long ldummy = 0;
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- G3d_initDefaults();
- if (!G3d_maskOpenOld()) {
- G3d_error(_("G3d_openCellNew: error in G3d_maskOpenOld"));
+ Rast3d_initDefaults();
+ if (!Rast3d_maskOpenOld()) {
+ Rast3d_error(_("Rast3d_openCellNew: error in Rast3d_maskOpenOld"));
return (void *)NULL;
}
compression = g3d_do_compression;
precision = g3d_precision;
- map = G3d_malloc(sizeof(RASTER3D_Map));
+ map = Rast3d_malloc(sizeof(RASTER3D_Map));
if (map == NULL) {
- G3d_error(_("G3d_openCellNew: error in G3d_malloc"));
+ Rast3d_error(_("Rast3d_openCellNew: error in Rast3d_malloc"));
return (void *)NULL;
}
@@ -236,11 +236,11 @@
map->tempName = G_tempfile();
map->data_fd = open(map->tempName, O_RDWR | O_CREAT | O_TRUNC, 0666);
if (map->data_fd < 0) {
- G3d_error(_("G3d_openCellNew: could not open file"));
+ Rast3d_error(_("Rast3d_openCellNew: could not open file"));
return (void *)NULL;
}
- G3d_makeMapsetMapDirectory(map->fileName);
+ Rast3d_makeMapsetMapDirectory(map->fileName);
map->useXdr = RASTER3D_USE_XDR;
@@ -278,15 +278,15 @@
/* the index is appended at the end of the file at closing time. since */
/* we do not know this position yet we write dummy values */
- if ((!G3d_writeInts(map->data_fd, map->useXdr,
+ if ((!Rast3d_writeInts(map->data_fd, map->useXdr,
&(map->indexLongNbytes), 1)) ||
- (!G3d_writeInts(map->data_fd, map->useXdr, &dummy, 1))) {
- G3d_error(_("G3d_openCellNew: can't write header"));
+ (!Rast3d_writeInts(map->data_fd, map->useXdr, &dummy, 1))) {
+ Rast3d_error(_("Rast3d_openCellNew: can't write header"));
return (void *)NULL;
}
if (write(map->data_fd, &ldummy, map->indexLongNbytes) !=
map->indexLongNbytes) {
- G3d_error(_("G3d_openCellNew: can't write header"));
+ Rast3d_error(_("Rast3d_openCellNew: can't write header"));
return (void *)NULL;
}
}
@@ -294,10 +294,10 @@
/* can't use a constant since this depends on sizeof (long) */
nofHeaderBytes = lseek(map->data_fd, (long)0, SEEK_CUR);
- G3d_range_init(map);
- G3d_adjustRegion(region);
+ Rast3d_range_init(map);
+ Rast3d_adjustRegion(region);
- if (!G3d_fillHeader(map, RASTER3D_WRITE_DATA, compression,
+ if (!Rast3d_fillHeader(map, RASTER3D_WRITE_DATA, compression,
g3d_do_rle_compression, g3d_do_lzw_compression,
g3d_file_type, precision, cache, RASTER3D_HAS_INDEX,
map->useXdr, typeIntern, nofHeaderBytes,
@@ -309,16 +309,16 @@
region->rows, region->cols, region->depths,
region->ew_res, region->ns_res, region->tb_res,
g3d_unit_default)) {
- G3d_error(_("G3d_openCellNew: error in G3d_fillHeader"));
+ Rast3d_error(_("Rast3d_openCellNew: error in Rast3d_fillHeader"));
return (void *)NULL;
}
/*Set the map window to the map region */
- G3d_regionCopy(&(map->window), region);
+ Rast3d_regionCopy(&(map->window), region);
/*Set the resampling function to nearest neighbor for data access */
- G3d_getNearestNeighborFunPtr(&(map->resampleFun));
+ Rast3d_getNearestNeighborFunPtr(&(map->resampleFun));
- G3d_maskOff(map);
+ Rast3d_maskOff(map);
return (void *)map;
}
Modified: grass/trunk/lib/raster3d/open2.c
===================================================================
--- grass/trunk/lib/raster3d/open2.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/open2.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,7 +12,7 @@
* cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
* RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
* RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>Rast3d_cacheSizeEncode ()</tt>
* (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
* specifies the number of tiles buffered in the cache. <em>region</em> specifies
* the 3d region.
@@ -38,7 +38,7 @@
*/
-void *G3d_openNewParam(const char *name, int typeIntern, int cache,
+void *Rast3d_openNewParam(const char *name, int typeIntern, int cache,
RASTER3D_Region * region, int type, int doLzw, int doRle,
int precision, int tileX, int tileY, int tileZ)
{
@@ -47,22 +47,22 @@
oldTileZ;
int oldType;
- G3d_initDefaults();
+ Rast3d_initDefaults();
- G3d_getCompressionMode(&oldCompress, &oldLzw, &oldRle, &oldPrecision);
- G3d_setCompressionMode(oldCompress, doLzw, doRle, precision);
+ Rast3d_getCompressionMode(&oldCompress, &oldLzw, &oldRle, &oldPrecision);
+ Rast3d_setCompressionMode(oldCompress, doLzw, doRle, precision);
- G3d_getTileDimension(&oldTileX, &oldTileY, &oldTileZ);
- G3d_setTileDimension(tileX, tileY, tileZ);
+ Rast3d_getTileDimension(&oldTileX, &oldTileY, &oldTileZ);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
- oldType = G3d_getFileType();
- G3d_setFileType(type);
+ oldType = Rast3d_getFileType();
+ Rast3d_setFileType(type);
- map = G3d_openCellNew(name, typeIntern, cache, region);
+ map = Rast3d_openCellNew(name, typeIntern, cache, region);
- G3d_setCompressionMode(oldCompress, oldLzw, oldRle, oldPrecision);
- G3d_setTileDimension(oldTileX, oldTileY, oldTileZ);
- G3d_setFileType(oldType);
+ Rast3d_setCompressionMode(oldCompress, oldLzw, oldRle, oldPrecision);
+ Rast3d_setTileDimension(oldTileX, oldTileY, oldTileZ);
+ Rast3d_setFileType(oldType);
return map;
}
@@ -78,7 +78,7 @@
* cache-mode used and must be either RASTER3D_NO_CACHE, RASTER3D_USE_CACHE_DEFAULT,
* RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y, RASTER3D_USE_CACHE_Z,
* RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ, RASTER3D_USE_CACHE_YZ,
- * RASTER3D_USE_CACHE_XYZ, the result of <tt>G3d_cacheSizeEncode ()</tt>
+ * RASTER3D_USE_CACHE_XYZ, the result of <tt>Rast3d_cacheSizeEncode ()</tt>
* (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer which
* specifies the number of tiles buffered in the cache. <em>region</em> specifies
* the 3d region.
@@ -95,28 +95,28 @@
*/
-void *G3d_openNewOptTileSize(const char *name, int cache, RASTER3D_Region * region, int type, int maxSize)
+void *Rast3d_openNewOptTileSize(const char *name, int cache, RASTER3D_Region * region, int type, int maxSize)
{
void *map;
int oldTileX, oldTileY, oldTileZ, oldType;
int tileX, tileY, tileZ;
- G3d_initDefaults();
+ Rast3d_initDefaults();
- G3d_getTileDimension(&oldTileX, &oldTileY, &oldTileZ);
+ Rast3d_getTileDimension(&oldTileX, &oldTileY, &oldTileZ);
- G3d_computeOptimalTileDimension(region, type, &tileX, &tileY, &tileZ, maxSize);
+ Rast3d_computeOptimalTileDimension(region, type, &tileX, &tileY, &tileZ, maxSize);
- G3d_setTileDimension(tileX, tileY, tileZ);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
- oldType = G3d_getFileType();
- G3d_setFileType(type);
+ oldType = Rast3d_getFileType();
+ Rast3d_setFileType(type);
- map = G3d_openCellNew(name, RASTER3D_TILE_SAME_AS_FILE, cache, region);
+ map = Rast3d_openCellNew(name, RASTER3D_TILE_SAME_AS_FILE, cache, region);
- G3d_setTileDimension(oldTileX, oldTileY, oldTileZ);
- G3d_setFileType(oldType);
+ Rast3d_setTileDimension(oldTileX, oldTileY, oldTileZ);
+ Rast3d_setFileType(oldType);
return map;
}
Modified: grass/trunk/lib/raster3d/param.c
===================================================================
--- grass/trunk/lib/raster3d/param.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/param.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -14,11 +14,11 @@
struct Option *dimension;
struct Option *cache;
-} G3d_paramType;
+} Rast3d_paramType;
/*----------------------------------------------------------------------------*/
-static G3d_paramType *param;
+static Rast3d_paramType *param;
/*!
@@ -33,14 +33,14 @@
* of the tiles (<em>tiledimension</em>). Every of these values defaults to the
* value described in RASTER3D Defaults.
* This function has to be used in conjunction with
- * G3d_getStandard3dInputParams() (cf.{g3d:G3d.getStandard3dInputParams}).
+ * Rast3d_getStandard3dInputParams() (cf.{g3d:G3d.getStandard3dInputParams}).
*
* \return void
*/
-void G3d_setStandard3dInputParams()
+void Rast3d_setStandard3dInputParams()
{
- param = G3d_malloc(sizeof(G3d_paramType));
+ param = Rast3d_malloc(sizeof(Rast3d_paramType));
param->type = G_define_standard_option(G_OPT_R3_TYPE);
@@ -53,7 +53,7 @@
/*----------------------------------------------------------------------------*/
-int G3d_getStandard3dParams(int *useTypeDefault, int *type,
+int Rast3d_getStandard3dParams(int *useTypeDefault, int *type,
int *useLzwDefault, int *doLzw,
int *useRleDefault, int *doRle,
int *usePrecisionDefault, int *precision,
@@ -65,25 +65,25 @@
*useTypeDefault = *useLzwDefault = *useRleDefault = 0;
*usePrecisionDefault = *useDimensionDefault = 0;
- G3d_initDefaults();
+ Rast3d_initDefaults();
if (strcmp(param->type->answer, "double") == 0)
*type = DCELL_TYPE;
else if (strcmp(param->type->answer, "float") == 0)
*type = FCELL_TYPE;
else {
- *type = G3d_getFileType();
+ *type = Rast3d_getFileType();
*useTypeDefault = 1;
}
- G3d_getCompressionMode(&doCompress, doLzw, doRle, precision);
+ Rast3d_getCompressionMode(&doCompress, doLzw, doRle, precision);
if (strcmp(param->precision->answer, "default") != 0) {
if (strcmp(param->precision->answer, "max") == 0)
*precision = -1;
else if ((sscanf(param->precision->answer, "%d", precision) != 1) ||
(*precision < 0)) {
- G3d_error(_("G3d_getStandard3dParams: precision value invalid"));
+ Rast3d_error(_("Rast3d_getStandard3dParams: precision value invalid"));
return 0;
}
}
@@ -112,18 +112,18 @@
else
*useLzwDefault = *useRleDefault = 1;
- G3d_getTileDimension(tileX, tileY, tileZ);
+ Rast3d_getTileDimension(tileX, tileY, tileZ);
if (strcmp(param->dimension->answer, "default") != 0) {
if (sscanf(param->dimension->answer, "%dx%dx%d",
tileX, tileY, tileZ) != 3) {
- G3d_error(_("G3d_getStandard3dParams: tile dimension value invalid"));
+ Rast3d_error(_("Rast3d_getStandard3dParams: tile dimension value invalid"));
return 0;
}
}
else
*useDimensionDefault = 1;
- G3d_free(param);
+ Rast3d_free(param);
return 1;
}
@@ -132,7 +132,7 @@
static struct Option *windowParam = NULL;
-void G3d_setWindowParams(void)
+void Rast3d_setWindowParams(void)
{
windowParam = G_define_option();
windowParam->key = "region3";
@@ -145,7 +145,7 @@
/*----------------------------------------------------------------------------*/
-char *G3d_getWindowParams(void)
+char *Rast3d_getWindowParams(void)
{
if (windowParam == NULL)
return NULL;
Modified: grass/trunk/lib/raster3d/putvalue.c
===================================================================
--- grass/trunk/lib/raster3d/putvalue.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/putvalue.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -5,7 +5,7 @@
/*!
* \brief
*
- * Is equivalent to G3d_putValue (map, x, y, z, &value, FCELL_TYPE).
+ * Is equivalent to Rast3d_putValue (map, x, y, z, &value, FCELL_TYPE).
*
* \param map
* \param x
@@ -15,23 +15,23 @@
* \return int
*/
-int G3d_putFloat(RASTER3D_Map * map, int x, int y, int z, float value)
+int Rast3d_putFloat(RASTER3D_Map * map, int x, int y, int z, float value)
{
int tileIndex, offs;
float *tile;
if (map->typeIntern == DCELL_TYPE) {
- if (!G3d_putDouble(map, x, y, z, (double)value)) {
- G3d_error("G3d_putFloat: error in G3d_putDouble");
+ if (!Rast3d_putDouble(map, x, y, z, (double)value)) {
+ Rast3d_error("Rast3d_putFloat: error in Rast3d_putDouble");
return 0;
}
return 1;
}
- G3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
- tile = (float *)G3d_getTilePtr(map, tileIndex);
+ Rast3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
+ tile = (float *)Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL) {
- G3d_error("G3d_putFloat: error in G3d_getTilePtr");
+ Rast3d_error("Rast3d_putFloat: error in Rast3d_getTilePtr");
return 0;
}
@@ -45,7 +45,7 @@
/*!
* \brief
*
- * Is equivalent to G3d_putValue (map, x, y, z, &value, DCELL_TYPE).
+ * Is equivalent to Rast3d_putValue (map, x, y, z, &value, DCELL_TYPE).
*
* \param map
* \param x
@@ -55,23 +55,23 @@
* \return int
*/
-int G3d_putDouble(RASTER3D_Map * map, int x, int y, int z, double value)
+int Rast3d_putDouble(RASTER3D_Map * map, int x, int y, int z, double value)
{
int tileIndex, offs;
double *tile;
if (map->typeIntern == FCELL_TYPE) {
- if (!G3d_putFloat(map, x, y, z, (float)value)) {
- G3d_error("G3d_putDouble: error in G3d_putFloat");
+ if (!Rast3d_putFloat(map, x, y, z, (float)value)) {
+ Rast3d_error("Rast3d_putDouble: error in Rast3d_putFloat");
return 0;
}
return 1;
}
- G3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
- tile = (double *)G3d_getTilePtr(map, tileIndex);
+ Rast3d_coord2tileIndex(map, x, y, z, &tileIndex, &offs);
+ tile = (double *)Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL) {
- G3d_error("G3d_putDouble: error in G3d_getTilePtr");
+ Rast3d_error("Rast3d_putDouble: error in Rast3d_getTilePtr");
return 0;
}
@@ -99,18 +99,18 @@
*/
int
-G3d_putValue(RASTER3D_Map * map, int x, int y, int z, const void *value, int type)
+Rast3d_putValue(RASTER3D_Map * map, int x, int y, int z, const void *value, int type)
{
if (type == FCELL_TYPE) {
- if (!G3d_putFloat(map, x, y, z, *((float *)value))) {
- G3d_error("G3d_putValue: error in G3d_putFloat");
+ if (!Rast3d_putFloat(map, x, y, z, *((float *)value))) {
+ Rast3d_error("Rast3d_putValue: error in Rast3d_putFloat");
return 0;
}
return 1;
}
- if (!G3d_putDouble(map, x, y, z, *((double *)value))) {
- G3d_error("G3d_putValue: error in G3d_putDouble");
+ if (!Rast3d_putDouble(map, x, y, z, *((double *)value))) {
+ Rast3d_error("Rast3d_putValue: error in Rast3d_putDouble");
return 0;
}
return 1;
Modified: grass/trunk/lib/raster3d/range.c
===================================================================
--- grass/trunk/lib/raster3d/range.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/range.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -14,7 +14,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_range_updateFromTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
+Rast3d_range_updateFromTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
int depths, int xRedundant, int yRedundant,
int zRedundant, int nofNum, int type)
{
@@ -22,7 +22,7 @@
struct FPRange *range;
range = &(map->range);
- cellType = G3d_g3dType2cellType(type);
+ cellType = Rast3d_g3dType2cellType(type);
if (nofNum == map->tileSize) {
Rast_row_update_fp_range(tile, map->tileSize, range, cellType);
@@ -33,13 +33,13 @@
for (z = 0; z < depths; z++) {
for (y = 0; y < rows; y++) {
Rast_row_update_fp_range(tile, cols, range, cellType);
- tile = G_incr_void_ptr(tile, map->tileX * G3d_length(type));
+ tile = G_incr_void_ptr(tile, map->tileX * Rast3d_length(type));
}
if (yRedundant)
tile =
G_incr_void_ptr(tile,
map->tileX * yRedundant *
- G3d_length(type));
+ Rast3d_length(type));
}
return;
}
@@ -47,7 +47,7 @@
if (yRedundant) {
for (z = 0; z < depths; z++) {
Rast_row_update_fp_range(tile, map->tileX * rows, range, cellType);
- tile = G_incr_void_ptr(tile, map->tileXY * G3d_length(type));
+ tile = G_incr_void_ptr(tile, map->tileXY * Rast3d_length(type));
}
return;
}
@@ -58,7 +58,7 @@
/*---------------------------------------------------------------------------*/
int
-G3d_readRange(const char *name, const char *mapset, struct FPRange *drange)
+Rast3d_readRange(const char *name, const char *mapset, struct FPRange *drange)
/* adapted from Rast_read_fp_range */
{
int fd;
@@ -111,11 +111,11 @@
* 0 ... otherwise.
*/
-int G3d_range_load(RASTER3D_Map * map)
+int Rast3d_range_load(RASTER3D_Map * map)
{
if (map->operation == RASTER3D_WRITE_DATA)
return 1;
- if (G3d_readRange(map->fileName, map->mapset, &(map->range)) == -1) {
+ if (Rast3d_readRange(map->fileName, map->mapset, &(map->range)) == -1) {
return 0;
}
@@ -137,7 +137,7 @@
* \return void
*/
-void G3d_range_min_max(RASTER3D_Map * map, double *min, double *max)
+void Rast3d_range_min_max(RASTER3D_Map * map, double *min, double *max)
{
Rast_get_fp_range_min_max(&(map->range), min, max);
}
@@ -198,15 +198,15 @@
* 0 ... otherwise.
*/
-int G3d_range_write(RASTER3D_Map * map)
+int Rast3d_range_write(RASTER3D_Map * map)
{
char path[GPATH_MAX];
- G3d_filename(path, RASTER3D_RANGE_ELEMENT, map->fileName, map->mapset);
+ Rast3d_filename(path, RASTER3D_RANGE_ELEMENT, map->fileName, map->mapset);
remove(path);
if (writeRange(map->fileName, &(map->range)) == -1) {
- G3d_error("G3d_closeCellNew: error in writeRange");
+ Rast3d_error("Rast3d_closeCellNew: error in writeRange");
return 0;
}
@@ -215,7 +215,7 @@
/*---------------------------------------------------------------------------*/
-int G3d_range_init(RASTER3D_Map * map)
+int Rast3d_range_init(RASTER3D_Map * map)
{
Rast_init_fp_range(&(map->range));
return 0;
Modified: grass/trunk/lib/raster3d/raster3d_intern.h
===================================================================
--- grass/trunk/lib/raster3d/raster3d_intern.h 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/raster3d_intern.h 2011-08-10 17:27:10 UTC (rev 47537)
@@ -61,8 +61,8 @@
/*---------------------------------------------------------------------------*/
-extern void G3d_fatalError(const char * /* msg */ , ...);
-extern void G3d_fatalError_noargs(const char * /* msg */ );
+extern void Rast3d_fatalError(const char * /* msg */ , ...);
+extern void Rast3d_fatalError_noargs(const char * /* msg */ );
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/region.c
===================================================================
--- grass/trunk/lib/raster3d/region.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/region.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -19,7 +19,7 @@
* \return void
*/
-void G3d_extract2dRegion(RASTER3D_Region * region3d, struct Cell_head *region2d)
+void Rast3d_extract2dRegion(RASTER3D_Region * region3d, struct Cell_head *region2d)
{
region2d->proj = region3d->proj;
region2d->zone = region3d->zone;
@@ -46,7 +46,7 @@
* \return void
*/
-void G3d_regionToCellHead(RASTER3D_Region * region3d, struct Cell_head *region2d)
+void Rast3d_regionToCellHead(RASTER3D_Region * region3d, struct Cell_head *region2d)
{
region2d->proj = region3d->proj;
region2d->zone = region3d->zone;
@@ -86,7 +86,7 @@
*/
void
-G3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region * region3d)
+Rast3d_incorporate2dRegion(struct Cell_head *region2d, RASTER3D_Region * region3d)
{
region3d->proj = region2d->proj;
region3d->zone = region2d->zone;
@@ -115,7 +115,7 @@
*/
void
-G3d_regionFromToCellHead(struct Cell_head *region2d, RASTER3D_Region * region3d)
+Rast3d_regionFromToCellHead(struct Cell_head *region2d, RASTER3D_Region * region3d)
{
region3d->proj = region2d->proj;
region3d->zone = region2d->zone;
@@ -149,16 +149,16 @@
* \return void
*/
-void G3d_adjustRegion(RASTER3D_Region * region)
+void Rast3d_adjustRegion(RASTER3D_Region * region)
{
struct Cell_head region2d;
- G3d_regionToCellHead(region, ®ion2d);
+ Rast3d_regionToCellHead(region, ®ion2d);
G_adjust_Cell_head3(®ion2d, 1, 1, 1);
- G3d_regionFromToCellHead(®ion2d, region);
+ Rast3d_regionFromToCellHead(®ion2d, region);
if (region->depths <= 0)
- G3d_fatalError("G3d_adjustRegion: depths <= 0");
+ Rast3d_fatalError("Rast3d_adjustRegion: depths <= 0");
region->tb_res = (region->top - region->bottom) / region->depths;
}
@@ -175,16 +175,16 @@
* \return void
*/
-void G3d_adjustRegionRes(RASTER3D_Region * region)
+void Rast3d_adjustRegionRes(RASTER3D_Region * region)
{
struct Cell_head region2d;
- G3d_regionToCellHead(region, ®ion2d);
+ Rast3d_regionToCellHead(region, ®ion2d);
G_adjust_Cell_head3(®ion2d, 1, 1, 1);
- G3d_regionFromToCellHead(®ion2d, region);
+ Rast3d_regionFromToCellHead(®ion2d, region);
if (region->tb_res <= 0)
- G3d_fatalError("G3d_adjustRegionRes: tb_res <= 0");
+ Rast3d_fatalError("Rast3d_adjustRegionRes: tb_res <= 0");
region->depths = (region->top - region->bottom + region->tb_res / 2.0) /
region->tb_res;
@@ -205,7 +205,7 @@
* \return void
*/
-void G3d_regionCopy(RASTER3D_Region * regionDest, RASTER3D_Region * regionSrc)
+void Rast3d_regionCopy(RASTER3D_Region * regionDest, RASTER3D_Region * regionSrc)
{
*regionDest = *regionSrc;
}
@@ -214,19 +214,19 @@
/*---------------------------------------------------------------------------*/
int
-G3d_readRegionMap(const char *name, const char *mapset, RASTER3D_Region * region)
+Rast3d_readRegionMap(const char *name, const char *mapset, RASTER3D_Region * region)
{
char fullName[GPATH_MAX];
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
if (G_name_is_fully_qualified(name, xname, xmapset))
- G3d_filename(fullName, RASTER3D_HEADER_ELEMENT, xname, xmapset);
+ Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, xname, xmapset);
else {
if (!mapset || !*mapset)
mapset = G_find_grid3(name, "");
- G3d_filename(fullName, RASTER3D_HEADER_ELEMENT, name, mapset);
+ Rast3d_filename(fullName, RASTER3D_HEADER_ELEMENT, name, mapset);
}
- return G3d_readWindow(region, fullName);
+ return Rast3d_readWindow(region, fullName);
}
/*---------------------------------------------------------------------------*/
@@ -245,7 +245,7 @@
* \return int
*/
-int G3d_isValidLocation(RASTER3D_Region *region, double north, double east, double top)
+int Rast3d_isValidLocation(RASTER3D_Region *region, double north, double east, double top)
{
return ((north >= region->south) && (north <= region->north) &&
(east >= region->west) && (east <= region->east) &&
@@ -272,7 +272,7 @@
*/
void
-G3d_location2coord(RASTER3D_Region *region, double north, double east, double top,
+Rast3d_location2coord(RASTER3D_Region *region, double north, double east, double top,
int *x, int *y, int *z)
{
double col, row, depth;
@@ -289,7 +289,7 @@
*y = region->rows - (int)row - 1;
*z = (int)depth;
- G_debug(4, "G3d_location2coord x %i y %i z %i\n", *x, *y, *z);
+ G_debug(4, "Rast3d_location2coord x %i y %i z %i\n", *x, *y, *z);
}
@@ -298,7 +298,7 @@
*
* Converts region-coordinates <em>(north, east,
* top)</em> into cell-coordinates <em>(x, y, z)</em>.
- * This function calls G3d_fatalError in case location is not in window.
+ * This function calls Rast3d_fatalError in case location is not in window.
*
* \param map
* \param north
@@ -311,13 +311,13 @@
*/
void
-G3d_location2coord2(RASTER3D_Region *region, double north, double east, double top,
+Rast3d_location2coord2(RASTER3D_Region *region, double north, double east, double top,
int *x, int *y, int *z)
{
- if (!G3d_isValidLocation(region, north, east, top))
- G3d_fatalError("G3d_location2coord2: location not in region");
+ if (!Rast3d_isValidLocation(region, north, east, top))
+ Rast3d_fatalError("Rast3d_location2coord2: location not in region");
- G3d_location2coord(region, north, east, top, x, y, z);
+ Rast3d_location2coord(region, north, east, top, x, y, z);
}
/*!
@@ -354,11 +354,11 @@
*/
void
-G3d_coord2location(RASTER3D_Region * region, double x, double y, double z, double *north, double *east, double *top)
+Rast3d_coord2location(RASTER3D_Region * region, double x, double y, double z, double *north, double *east, double *top)
{
*north = region->north - y * region->ns_res;
*east = region->west + x * region->ew_res;
*top = region->bottom + z * region->tb_res;
- G_debug(4, "G3d_coord2location north %g east %g top %g\n", *north, *east, *top);
+ G_debug(4, "Rast3d_coord2location north %g east %g top %g\n", *north, *east, *top);
}
Modified: grass/trunk/lib/raster3d/resample.c
===================================================================
--- grass/trunk/lib/raster3d/resample.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/resample.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -22,28 +22,28 @@
*/
void
-G3d_nearestNeighbor(RASTER3D_Map * map, int x, int y, int z, void *value,
+Rast3d_nearestNeighbor(RASTER3D_Map * map, int x, int y, int z, void *value,
int type)
{
double north, east, top;
int row, col, depth;
/* convert (x, y, z) window coordinates into (north, east, top) */
- G3d_coord2location(&(map->window), (double)x + 0.5, (double)y + 0.5, (double)z + 0.5, &north, &east, &top);
+ Rast3d_coord2location(&(map->window), (double)x + 0.5, (double)y + 0.5, (double)z + 0.5, &north, &east, &top);
/* convert (north, east, top) into map region coordinates (row, col, depth) */
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
/* if (row, col, depth) outside map region return NULL value */
if ((row < 0) || (row >= map->region.rows) ||
(col < 0) || (col >= map->region.cols) ||
(depth < 0) || (depth >= map->region.depths)) {
- G3d_setNullValue(value, 1, type);
+ Rast3d_setNullValue(value, 1, type);
return;
}
/* Get the value from the map in map-region resolution */
- G3d_getValueRegion(map, col, row, depth, value, type);
+ Rast3d_getValueRegion(map, col, row, depth, value, type);
}
/*--------------------------------------------------------------------------*/
@@ -53,13 +53,13 @@
* \brief
*
* Sets the resampling function to be used by
- * G3d_getValue () (cf.{g3d:G3d.getValue}). This function is defined
+ * Rast3d_getValue () (cf.{g3d:G3d.getValue}). This function is defined
* as follows:
*
* \return void
*/
-void G3d_setResamplingFun(RASTER3D_Map * map, void (*resampleFun) ())
+void Rast3d_setResamplingFun(RASTER3D_Map * map, void (*resampleFun) ())
{
map->resampleFun = resampleFun;
}
@@ -77,7 +77,7 @@
* \return void
*/
-void G3d_getResamplingFun(RASTER3D_Map * map, void (**resampleFun) ())
+void Rast3d_getResamplingFun(RASTER3D_Map * map, void (**resampleFun) ())
{
*resampleFun = map->resampleFun;
}
@@ -89,12 +89,12 @@
* \brief
*
* Returns
- * in <em>nnFunPtr</em> a pointer to G3d_nearestNeighbor () (cf.{g3d:G3d.nearestNeighbor}).
+ * in <em>nnFunPtr</em> a pointer to Rast3d_nearestNeighbor () (cf.{g3d:G3d.nearestNeighbor}).
*
* \return void
*/
-void G3d_getNearestNeighborFunPtr(void (**nnFunPtr) ())
+void Rast3d_getNearestNeighborFunPtr(void (**nnFunPtr) ())
{
- *nnFunPtr = G3d_nearestNeighbor;
+ *nnFunPtr = Rast3d_nearestNeighbor;
}
Modified: grass/trunk/lib/raster3d/retile.c
===================================================================
--- grass/trunk/lib/raster3d/retile.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/retile.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -16,45 +16,45 @@
int tileXsave, tileYsave, tileZsave;
RASTER3D_Region region;
- saveType = G3d_getFileType();
- G3d_setFileType(G3d_fileTypeMap(map));
- G3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
- G3d_setTileDimension(tileX, tileY, tileZ);
- typeIntern = G3d_tileTypeMap(map);
- G3d_getRegionStructMap(map, ®ion);
+ saveType = Rast3d_getFileType();
+ Rast3d_setFileType(Rast3d_fileTypeMap(map));
+ Rast3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
+ typeIntern = Rast3d_tileTypeMap(map);
+ Rast3d_getRegionStructMap(map, ®ion);
- map2 = G3d_openCellNew(nameOut, typeIntern, RASTER3D_NO_CACHE, ®ion);
+ map2 = Rast3d_openCellNew(nameOut, typeIntern, RASTER3D_NO_CACHE, ®ion);
if (map2 == NULL)
- G3d_fatalError("G3d_retile: error in G3d_openCellNew");
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_openCellNew");
- G3d_setFileType(saveType);
- G3d_setTileDimension(tileXsave, tileYsave, tileZsave);
+ Rast3d_setFileType(saveType);
+ Rast3d_setTileDimension(tileXsave, tileYsave, tileZsave);
- data = G3d_allocTiles(map2, 1);
+ data = Rast3d_allocTiles(map2, 1);
if (data == NULL)
- G3d_fatalError("G3d_retile: error in G3d_allocTiles");
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_allocTiles");
- G3d_getNofTilesMap(map2, &nx, &ny, &nz);
+ Rast3d_getNofTilesMap(map2, &nx, &ny, &nz);
for (z = 0; z < nz; z++) {
G_percent(z, nz, 1);
for (y = 0; y < ny; y++)
for (x = 0; x < nx; x++) {
- G3d_getBlock(map, x * tileX, y * tileY, z * tileZ,
+ Rast3d_getBlock(map, x * tileX, y * tileY, z * tileZ,
tileX, tileY, tileZ, data, typeIntern);
- if (!G3d_writeTile
- (map2, G3d_tile2tileIndex(map2, x, y, z), data,
+ if (!Rast3d_writeTile
+ (map2, Rast3d_tile2tileIndex(map2, x, y, z), data,
typeIntern))
- G3d_fatalError
- ("G3d_retileNocache: error in G3d_writeTile");
+ Rast3d_fatalError
+ ("Rast3d_retileNocache: error in Rast3d_writeTile");
}
}
G_percent(1, 1, 1);
- G3d_freeTiles(data);
- G3d_closeCell(map2);
+ Rast3d_freeTiles(data);
+ Rast3d_closeCell(map2);
}
/*---------------------------------------------------------------------------*/
@@ -76,7 +76,7 @@
*/
void
-G3d_retile(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
+Rast3d_retile(void *map, const char *nameOut, int tileX, int tileY, int tileZ)
{
void *map2;
double value;
@@ -87,28 +87,28 @@
int tileXsave, tileYsave, tileZsave;
RASTER3D_Region region;
- if (!G3d_tileUseCacheMap(map)) {
+ if (!Rast3d_tileUseCacheMap(map)) {
retileNocache(map, nameOut, tileX, tileY, tileZ);
return;
}
- saveType = G3d_getFileType();
- G3d_setFileType(G3d_fileTypeMap(map));
- G3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
- G3d_setTileDimension(tileX, tileY, tileZ);
+ saveType = Rast3d_getFileType();
+ Rast3d_setFileType(Rast3d_fileTypeMap(map));
+ Rast3d_getTileDimension(&tileXsave, &tileYsave, &tileZsave);
+ Rast3d_setTileDimension(tileX, tileY, tileZ);
- typeIntern = G3d_tileTypeMap(map);
- G3d_getRegionStructMap(map, ®ion);
+ typeIntern = Rast3d_tileTypeMap(map);
+ Rast3d_getRegionStructMap(map, ®ion);
map2 =
- G3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, ®ion);
+ Rast3d_openCellNew(nameOut, typeIntern, RASTER3D_USE_CACHE_DEFAULT, ®ion);
if (map2 == NULL)
- G3d_fatalError("G3d_retile: error in G3d_openCellNew");
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_openCellNew");
- G3d_setFileType(saveType);
- G3d_setTileDimension(tileXsave, tileYsave, tileZsave);
+ Rast3d_setFileType(saveType);
+ Rast3d_setTileDimension(tileXsave, tileYsave, tileZsave);
- G3d_coord2tileCoord(map2, 0, 0, 0,
+ Rast3d_coord2tileCoord(map2, 0, 0, 0,
&xTile, &yTile, &zTile, &xOffs, &yOffs, &zOffs);
prev = zTile;
@@ -116,30 +116,30 @@
x = 0;
y = 0;
- G3d_getCoordsMap(map, &rows, &cols, &depths);
+ Rast3d_getCoordsMap(map, &rows, &cols, &depths);
for (z = 0; z < depths; z++) {
G_percent(z, depths, 1);
- G3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
+ Rast3d_coord2tileCoord(map2, x, y, z, &xTile, &yTile, &zTile,
&xOffs, &yOffs, &zOffs);
if (zTile > prev) {
- if (!G3d_flushAllTiles(map2))
- G3d_fatalError("G3d_retile: error in G3d_flushAllTiles");
+ if (!Rast3d_flushAllTiles(map2))
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_flushAllTiles");
prev++;
}
for (y = 0; y < rows; y++)
for (x = 0; x < cols; x++) {
- G3d_getValueRegion(map, x, y, z, &value, typeIntern);
- if (!G3d_putValue(map2, x, y, z, &value, typeIntern))
- G3d_fatalError("G3d_retile: error in G3d_putValue");
+ Rast3d_getValueRegion(map, x, y, z, &value, typeIntern);
+ if (!Rast3d_putValue(map2, x, y, z, &value, typeIntern))
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_putValue");
}
}
G_percent(1, 1, 1);
- if (!G3d_flushAllTiles(map2))
- G3d_fatalError("G3d_retile: error in G3d_flushAllTiles");
- if (!G3d_closeCell(map2))
- G3d_fatalError("G3d_retile: error in G3d_closeCell");
+ if (!Rast3d_flushAllTiles(map2))
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_flushAllTiles");
+ if (!Rast3d_closeCell(map2))
+ Rast3d_fatalError("Rast3d_retile: error in Rast3d_closeCell");
}
Modified: grass/trunk/lib/raster3d/rle.c
===================================================================
--- grass/trunk/lib/raster3d/rle.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/rle.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -126,7 +126,7 @@
char *head, *tail, *headStop, *headStop2;
if (nofElts <= 0)
- G3d_fatalError("trying to encode 0-length list");
+ Rast3d_fatalError("trying to encode 0-length list");
length = 0;
nofEqual = 1;
@@ -169,7 +169,7 @@
char *head, *tail, *headStop, *headStop2;
if (nofElts <= 0)
- G3d_fatalError("trying to encode 0-length list");
+ Rast3d_fatalError("trying to encode 0-length list");
length = 0;
nofEqual = 1;
@@ -247,7 +247,7 @@
src += eltLength;
}
- G3d_fatalError("G_rle_decode: string ends prematurely");
+ Rast3d_fatalError("G_rle_decode: string ends prematurely");
}
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/test/test_coordinate_transform.c
===================================================================
--- grass/trunk/lib/raster3d/test/test_coordinate_transform.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/test/test_coordinate_transform.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -41,8 +41,8 @@
/* We need to set up a specific region for the new g3d map.
* First we safe the default region. */
- G3d_getWindow(&default_region);
- G3d_regionCopy(®ion, &default_region);
+ Rast3d_getWindow(&default_region);
+ Rast3d_regionCopy(®ion, &default_region);
region.bottom = 0.0;
region.top = 1000;
@@ -54,12 +54,12 @@
region.cols = 10;
region.depths = 5;
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
- map = G3d_openNewOptTileSize("test_coordinate_transform", RASTER3D_USE_CACHE_XYZ, ®ion, FCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize("test_coordinate_transform", RASTER3D_USE_CACHE_XYZ, ®ion, FCELL_TYPE, 32);
/* The window is the same as the map region ... of course */
- G3d_setWindowMap(map, ®ion);
+ Rast3d_setWindowMap(map, ®ion);
G_message("Test the upper right corner, coordinates must be col = 9, row = 0, depth = 4");
@@ -83,10 +83,10 @@
east= 9999.9;
top = 999.9;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
- printf("G3d_location2coord col %i row %i depth %i\n", col, row, depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ printf("Rast3d_location2coord col %i row %i depth %i\n", col, row, depth);
if(region.cols - 1 != col || 0 != row || region.depths - 1 != depth) {
- G_message("Error in G3d_location2coord");
+ G_message("Error in Rast3d_location2coord");
sum++;
}
@@ -96,10 +96,10 @@
east= 5000.0;
top = 0.0;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
- printf("G3d_location2coord col %i row %i depth %i\n", col, row, depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ printf("Rast3d_location2coord col %i row %i depth %i\n", col, row, depth);
if(0 != col || 14 != row || 0 != depth) {
- G_message("Error in G3d_location2coord");
+ G_message("Error in Rast3d_location2coord");
sum++;
}
@@ -110,10 +110,10 @@
east= 7499.9;
top = 500.0;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
- printf("G3d_location2coord col %i row %i depth %i\n", col, row, depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ printf("Rast3d_location2coord col %i row %i depth %i\n", col, row, depth);
if((region.cols - 1)/2 != col || (region.rows - 1)/2 != row || (region.depths - 1)/2 != depth) {
- G_message("Error in G3d_location2coord");
+ G_message("Error in Rast3d_location2coord");
sum++;
}
@@ -123,10 +123,10 @@
east= 7000.1;
top = 800.1;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
- printf("G3d_location2coord col %i row %i depth %i\n", col, row, depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ printf("Rast3d_location2coord col %i row %i depth %i\n", col, row, depth);
if(4 != col || map->region.rows - 5 != row || 4 != depth) {
- G_message("Error in G3d_location2coord");
+ G_message("Error in Rast3d_location2coord");
sum++;
}
@@ -136,14 +136,14 @@
east= 6999.9;
top = 799.9;
- G3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
- printf("G3d_location2coord col %i row %i depth %i\n", col, row, depth);
+ Rast3d_location2coord(&(map->region), north, east, top, &col, &row, &depth);
+ printf("Rast3d_location2coord col %i row %i depth %i\n", col, row, depth);
if(3 != col || map->region.rows - 4 != row || 3 != depth) {
- G_message("Error in G3d_location2coord");
+ G_message("Error in Rast3d_location2coord");
sum++;
}
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
G_remove("grid3", "test_coordinate_transform");
@@ -157,7 +157,7 @@
int sum = 0;
RASTER3D_Region region, new_region;
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
region.bottom = 0.0;
region.top = 1000;
region.south = 10000;
@@ -172,93 +172,93 @@
region.tb_res = 0;
/* Test region adjustment */
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
if(region.ew_res != 500) {
- G_message("Error in G3d_adjustRegion: region.ew_res != 500");
+ G_message("Error in Rast3d_adjustRegion: region.ew_res != 500");
sum++;
}
if(region.ns_res != 500) {
- G_message("Error in G3d_adjustRegion: region.ew_res != 500");
+ G_message("Error in Rast3d_adjustRegion: region.ew_res != 500");
sum++;
}
if(region.tb_res != 200) {
- G_message("Error in G3d_adjustRegion: region.ew_res != 500");
+ G_message("Error in Rast3d_adjustRegion: region.ew_res != 500");
sum++;
}
/* Test the region copy */
- G3d_regionCopy(&new_region, ®ion);
+ Rast3d_regionCopy(&new_region, ®ion);
if(region.bottom != new_region.bottom) {
- G_message("Error in G3d_regionCopy: region.bottom != new_region.bottom");
+ G_message("Error in Rast3d_regionCopy: region.bottom != new_region.bottom");
sum++;
}
if(region.cols != new_region.cols) {
- G_message("Error in G3d_regionCopy: region.cols != new_region.cols");
+ G_message("Error in Rast3d_regionCopy: region.cols != new_region.cols");
sum++;
}
if(region.depths != new_region.depths) {
- G_message("Error in G3d_regionCopy: region.depths != new_region.depths");
+ G_message("Error in Rast3d_regionCopy: region.depths != new_region.depths");
sum++;
}
if(region.east != new_region.east) {
- G_message("Error in G3d_regionCopy: region.east != new_region.east");
+ G_message("Error in Rast3d_regionCopy: region.east != new_region.east");
sum++;
}
if(region.ew_res != new_region.ew_res) {
- G_message("Error in G3d_regionCopy: region.ew_res != new_region.ew_res");
+ G_message("Error in Rast3d_regionCopy: region.ew_res != new_region.ew_res");
sum++;
}
if(region.north != new_region.north) {
- G_message("Error in G3d_regionCopy: region.north != new_region.north");
+ G_message("Error in Rast3d_regionCopy: region.north != new_region.north");
sum++;
}
if(region.ns_res != new_region.ns_res) {
- G_message("Error in G3d_regionCopy: region.ns_res != new_region.ns_res");
+ G_message("Error in Rast3d_regionCopy: region.ns_res != new_region.ns_res");
sum++;
}
if(region.proj != new_region.proj) {
- G_message("Error in G3d_regionCopy: region.proj != new_region.proj");
+ G_message("Error in Rast3d_regionCopy: region.proj != new_region.proj");
sum++;
}
if(region.rows != new_region.rows) {
- G_message("Error in G3d_regionCopy: region.rows != new_region.rows");
+ G_message("Error in Rast3d_regionCopy: region.rows != new_region.rows");
sum++;
}
if(region.south != new_region.south) {
- G_message("Error in G3d_regionCopy: region.south != new_region.south");
+ G_message("Error in Rast3d_regionCopy: region.south != new_region.south");
sum++;
}
if(region.tb_res != new_region.tb_res) {
- G_message("Error in G3d_regionCopy: region.tb_res != new_region.tb_res");
+ G_message("Error in Rast3d_regionCopy: region.tb_res != new_region.tb_res");
sum++;
}
if(region.top != new_region.top) {
- G_message("Error in G3d_regionCopy: region.top != new_region.top");
+ G_message("Error in Rast3d_regionCopy: region.top != new_region.top");
sum++;
}
if(region.west != new_region.west) {
- G_message("Error in G3d_regionCopy: region.west != new_region.west");
+ G_message("Error in Rast3d_regionCopy: region.west != new_region.west");
sum++;
}
if(region.zone != new_region.zone) {
- G_message("Error in G3d_regionCopy: region.zone != new_region.zone");
+ G_message("Error in Rast3d_regionCopy: region.zone != new_region.zone");
sum++;
}
Modified: grass/trunk/lib/raster3d/test/test_main.c
===================================================================
--- grass/trunk/lib/raster3d/test/test_main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/test/test_main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -85,7 +85,7 @@
exit(EXIT_FAILURE);
/* Initiate the defaults for testing */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/*Run the unit tests */
if (param.testunit->answer || param.full->answer) {
Modified: grass/trunk/lib/raster3d/test/test_put_get_value.c
===================================================================
--- grass/trunk/lib/raster3d/test/test_put_get_value.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/test/test_put_get_value.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -68,7 +68,7 @@
/* We need to set up a specific region for the new g3d map.
* First we safe the default region. */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
region.bottom = 0.0;
region.top = 1000;
@@ -80,12 +80,12 @@
region.cols = 10;
region.depths = 5;
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
- map = G3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
/* The window is the same as the map region ... of course */
- G3d_setWindowMap(map, ®ion);
+ Rast3d_setWindowMap(map, ®ion);
/*
ROWS
1000 1500 2000 2500 3000 3500 4000 4500 5000 5500 6500 7000 7500 8000 8500 9000 north
@@ -108,12 +108,12 @@
for(x = 0; x < region.cols; x++) {
/* Add cols, rows and depths and put this in the map */
value = x + y + z;
- G3d_putValue(map, x, y, z, &value, DCELL_TYPE);
+ Rast3d_putValue(map, x, y, z, &value, DCELL_TYPE);
}
}
}
/* Write everything to the disk */
- G3d_flushAllTiles(map);
+ Rast3d_flushAllTiles(map);
/* Reread the map and compare the expected results */
@@ -168,21 +168,21 @@
east = region.west + region.ew_res * col;
top = region.bottom + region.tb_res * depth;
- G3d_getRegionValue(map, north, east, top, &value, DCELL_TYPE);
- G3d_getValue(map, col, row, depth, &value_ref, DCELL_TYPE);
- /* G3d_getValueRegion does not work with coordinates outside the region */
+ Rast3d_getRegionValue(map, north, east, top, &value, DCELL_TYPE);
+ Rast3d_getValue(map, col, row, depth, &value_ref, DCELL_TYPE);
+ /* Rast3d_getValueRegion does not work with coordinates outside the region */
printf("Value %g == %g\n", value, value_ref);
if(value == 0 || value < 0 || value > 0) {
- G_message("Error in G3d_getRegionValue");
+ G_message("Error in Rast3d_getRegionValue");
sum++;
}
if(value_ref == 0 || value_ref < 0 || value_ref > 0) {
- G_message("Error in G3d_getValue");
+ G_message("Error in Rast3d_getValue");
sum++;
}
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
G_remove("grid3", "test_put_get_value_dcell");
@@ -208,7 +208,7 @@
/* We need to set up a specific region for the new g3d map.
* First we safe the default region. */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
region.bottom = 0.0;
region.top = 1000;
@@ -220,24 +220,24 @@
region.cols = 10;
region.depths = 5;
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
- map = G3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, ®ion, FCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize("test_put_get_value_dcell", RASTER3D_USE_CACHE_XY, ®ion, FCELL_TYPE, 32);
/* The window is the same as the map region ... of course */
- G3d_setWindowMap(map, ®ion);
+ Rast3d_setWindowMap(map, ®ion);
for(z = 0; z < region.depths; z++) {
for(y = 0; y < region.rows; y++) {
for(x = 0; x < region.cols; x++) {
/* Add cols, rows and depths and put this in the map */
value = x + y + z;
- G3d_putValue(map, x, y, z, &value, FCELL_TYPE);
+ Rast3d_putValue(map, x, y, z, &value, FCELL_TYPE);
}
}
}
/* Write everything to the disk */
- G3d_flushAllTiles(map);
+ Rast3d_flushAllTiles(map);
/* Reread the map and compare the expected results */
@@ -290,21 +290,21 @@
east = region.west + region.ew_res * col;
top = region.bottom + region.tb_res * depth;
- G3d_getRegionValue(map, north, east, top, &value, FCELL_TYPE);
- G3d_getValue(map, 10, 15, 5, &value_ref, FCELL_TYPE);
- /* G3d_getValueRegion does not work with coordinates outside the region */
+ Rast3d_getRegionValue(map, north, east, top, &value, FCELL_TYPE);
+ Rast3d_getValue(map, 10, 15, 5, &value_ref, FCELL_TYPE);
+ /* Rast3d_getValueRegion does not work with coordinates outside the region */
printf("Value %g == %g\n", value, value_ref);
if(value == 0 || value < 0 || value > 0) {
- G_message("Error in G3d_getRegionValue");
+ G_message("Error in Rast3d_getRegionValue");
sum++;
}
if(value_ref == 0 || value_ref < 0 || value_ref > 0) {
- G_message("Error in G3d_getValue");
+ G_message("Error in Rast3d_getValue");
sum++;
}
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
G_remove("grid3", "test_put_get_value_fcell");
@@ -330,7 +330,7 @@
/* We need to set up a specific region for the new g3d map.
* First we safe the default region. */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
region.bottom = 0.0;
region.top = 1000;
@@ -342,22 +342,22 @@
region.cols = 10;
region.depths = 5;
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
- map = G3d_openNewOptTileSize("test_put_get_value_resample", RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize("test_put_get_value_resample", RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, 32);
/* We modify the window for resampling tests */
- G3d_regionCopy(&window, ®ion);
+ Rast3d_regionCopy(&window, ®ion);
/* Double the cols, rows and depths -> 8x resolution window */
window.rows = 30;
window.cols = 20;
window.depths = 10;
- G3d_adjustRegion(&window);
+ Rast3d_adjustRegion(&window);
/* The window is the same as the map region ... of course */
- G3d_setWindowMap(map, &window);
+ Rast3d_setWindowMap(map, &window);
/*
ROWS
1000 1500 2000 2500 3000 3500 4000 4500 5000 5500 6500 7000 7500 8000 8500 9000 north
@@ -385,12 +385,12 @@
for(x = 0; x < region.cols; x++) {
/* Add cols, rows and depths and put this in the map */
value = x + y + z;
- G3d_putDouble(map, x, y, z, value);
+ Rast3d_putDouble(map, x, y, z, value);
}
}
}
/* Write everything to the disk */
- G3d_flushAllTiles(map);
+ Rast3d_flushAllTiles(map);
/* Reread the map and compare the expected results */
@@ -435,7 +435,7 @@
sum += test_resampling_dcell(map, north, east, top, col, row, depth, 2);
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
G_remove("grid3", "test_put_get_value_dcell");
@@ -452,26 +452,26 @@
DCELL value_reg;
DCELL value_win;
- G3d_getRegionValue(map, north, east, top, &value, DCELL_TYPE);
- G3d_getWindowValue(map, north, east, top, &value_win, DCELL_TYPE);
- G3d_getValue(map, col * fact, row * fact, depth * fact, &value_ref, DCELL_TYPE);
- G3d_getValueRegion(map, col, row, depth, &value_reg, DCELL_TYPE);
+ Rast3d_getRegionValue(map, north, east, top, &value, DCELL_TYPE);
+ Rast3d_getWindowValue(map, north, east, top, &value_win, DCELL_TYPE);
+ Rast3d_getValue(map, col * fact, row * fact, depth * fact, &value_ref, DCELL_TYPE);
+ Rast3d_getValueRegion(map, col, row, depth, &value_reg, DCELL_TYPE);
printf("Value %g == %g == %g == %g\n", value, value_win, value_ref, value_reg);
if(value != col + row + depth) {
- G_message("Error in G3d_getRegionValue");
+ G_message("Error in Rast3d_getRegionValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getWindowValue");
+ G_message("Error in Rast3d_getWindowValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getValue");
+ G_message("Error in Rast3d_getValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getValueRegion");
+ G_message("Error in Rast3d_getValueRegion");
sum++;
}
@@ -488,26 +488,26 @@
FCELL value_reg;
FCELL value_win;
- G3d_getRegionValue(map, north, east, top, &value, FCELL_TYPE);
- G3d_getWindowValue(map, north, east, top, &value_win, FCELL_TYPE);
- G3d_getValue(map, col * fact, row * fact, depth * fact, &value_ref, FCELL_TYPE);
- G3d_getValueRegion(map, col, row, depth, &value_reg, FCELL_TYPE);
+ Rast3d_getRegionValue(map, north, east, top, &value, FCELL_TYPE);
+ Rast3d_getWindowValue(map, north, east, top, &value_win, FCELL_TYPE);
+ Rast3d_getValue(map, col * fact, row * fact, depth * fact, &value_ref, FCELL_TYPE);
+ Rast3d_getValueRegion(map, col, row, depth, &value_reg, FCELL_TYPE);
printf("Value %g == %g == %g == %g\n", value, value_win, value_ref, value_reg);
if(value != col + row + depth) {
- G_message("Error in G3d_getRegionValue");
+ G_message("Error in Rast3d_getRegionValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getWindowValue");
+ G_message("Error in Rast3d_getWindowValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getValue");
+ G_message("Error in Rast3d_getValue");
sum++;
}
if(value != col + row + depth) {
- G_message("Error in G3d_getValueRegion");
+ G_message("Error in Rast3d_getValueRegion");
sum++;
}
Modified: grass/trunk/lib/raster3d/tilealloc.c
===================================================================
--- grass/trunk/lib/raster3d/tilealloc.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tilealloc.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -23,13 +23,13 @@
* NULL ... otherwise.
*/
-void *G3d_allocTilesType(RASTER3D_Map * map, int nofTiles, int type)
+void *Rast3d_allocTilesType(RASTER3D_Map * map, int nofTiles, int type)
{
void *tiles;
- tiles = G3d_malloc(map->tileSize * G3d_length(type) * nofTiles);
+ tiles = Rast3d_malloc(map->tileSize * Rast3d_length(type) * nofTiles);
if (tiles == NULL) {
- G3d_error("G3d_allocTilesType: error in G3d_malloc");
+ Rast3d_error("Rast3d_allocTilesType: error in Rast3d_malloc");
return NULL;
}
@@ -42,20 +42,20 @@
/*!
* \brief
*
- * Is equivalent to G3d_allocTilesType (map, nofTiles, G3d_fileTypeMap (map)).
+ * Is equivalent to Rast3d_allocTilesType (map, nofTiles, Rast3d_fileTypeMap (map)).
*
* \param map
* \param nofTiles
* \return void *
*/
-void *G3d_allocTiles(RASTER3D_Map * map, int nofTiles)
+void *Rast3d_allocTiles(RASTER3D_Map * map, int nofTiles)
{
void *tiles;
- tiles = G3d_allocTilesType(map, nofTiles, map->typeIntern);
+ tiles = Rast3d_allocTilesType(map, nofTiles, map->typeIntern);
if (tiles == NULL) {
- G3d_error("G3d_allocTiles: error in G3d_allocTilesType");
+ Rast3d_error("Rast3d_allocTiles: error in Rast3d_allocTilesType");
return NULL;
}
@@ -68,13 +68,13 @@
/*!
* \brief
*
- * Is equivalent to <tt>G3d_free (tiles);</tt>
+ * Is equivalent to <tt>Rast3d_free (tiles);</tt>
*
* \param tiles
* \return void
*/
-void G3d_freeTiles(void *tiles)
+void Rast3d_freeTiles(void *tiles)
{
- G3d_free(tiles);
+ Rast3d_free(tiles);
}
Modified: grass/trunk/lib/raster3d/tileio.c
===================================================================
--- grass/trunk/lib/raster3d/tileio.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tileio.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -29,7 +29,7 @@
* is read from file and stored in the buffer provided by the map structure.
* The pointer to this buffer is returned. If the buffer already contains the
* tile with <em>tileIndex</em> reading is skipped. Data which was stored in
- * earlier calls to <tt>G3d_getTilePtr</tt> is destroyed. If the tile with <em>tileIndex</em> is not stored on the file corresponding to <em>map</em>, and <em>tileIndex</em> is a valid index the buffer is filled with NULL-values.<br>
+ * earlier calls to <tt>Rast3d_getTilePtr</tt> is destroyed. If the tile with <em>tileIndex</em> is not stored on the file corresponding to <em>map</em>, and <em>tileIndex</em> is a valid index the buffer is filled with NULL-values.<br>
* If <em>map</em> is old and the cache is used the tile with <em>tileIndex</em> is
* read from file and stored in one of the cache buffers. The pointer to buffer
* is returned. If no free cache buffer is available an unlocked cache-buffer
@@ -42,8 +42,8 @@
* as if <em>map</em> is old and the cache is not used. If the tile with <em>tileIndex</em>
* is already stored on file, it is read into the buffer, if not,
* the cells are set to null-values. If the buffer corresponding to the pointer
- * is used for writing, subsequent calls to <tt>G3d_getTilePtr</tt> may destroy the
- * values already stored in the buffer. Use <tt>G3d_flushTile</tt> to write the buffer
+ * is used for writing, subsequent calls to <tt>Rast3d_getTilePtr</tt> may destroy the
+ * values already stored in the buffer. Use <tt>Rast3d_flushTile</tt> to write the buffer
* to the file before reusing it for a different index. The use of this buffer
* as write buffer is discouraged.<br>
* If <em>map</em> is new and the cache is used the functionality is the same as if
@@ -59,8 +59,8 @@
* Care has to be taken if this function is used in non-cache mode since it is
* implicitly invoked every time a read or write request is issued. The only
* I/O-functions for which it is safe to assume that they do not invoke
- * <tt>G3d_getTilePtr</tt> are <tt>G3d_readTile()</tt> and
- * <tt>G3d_writeTile()</tt> and their corresponding type-specific versions.
+ * <tt>Rast3d_getTilePtr</tt> are <tt>Rast3d_readTile()</tt> and
+ * <tt>Rast3d_writeTile()</tt> and their corresponding type-specific versions.
*
* \param map
* \param tileIndex
@@ -68,19 +68,19 @@
* NULL ... otherwise.
*/
-void *G3d_getTilePtr(RASTER3D_Map * map, int tileIndex)
+void *Rast3d_getTilePtr(RASTER3D_Map * map, int tileIndex)
{
void *ptr;
if ((tileIndex >= map->nTiles) || (tileIndex < 0)) {
- G3d_error("G3d_getTilePtr: tileIndex out of range");
+ Rast3d_error("Rast3d_getTilePtr: tileIndex out of range");
return NULL;
}
if (map->useCache) {
- ptr = G3d_cache_elt_ptr(map->cache, tileIndex);
+ ptr = Rast3d_cache_elt_ptr(map->cache, tileIndex);
if (ptr == NULL) {
- G3d_error("G3d_getTilePtr: error in G3d_cache_elt_ptr");
+ Rast3d_error("Rast3d_getTilePtr: error in Rast3d_cache_elt_ptr");
return NULL;
}
return ptr;
@@ -90,8 +90,8 @@
return map->data;
map->currentIndex = tileIndex;
- if (!G3d_readTile(map, map->currentIndex, map->data, map->typeIntern)) {
- G3d_error("G3d_getTilePtr: error in G3d_readTile");
+ if (!Rast3d_readTile(map, map->currentIndex, map->data, map->typeIntern)) {
+ Rast3d_error("Rast3d_getTilePtr: error in Rast3d_readTile");
return NULL;
}
@@ -104,7 +104,7 @@
/*!
* \brief
*
- * Same functionality as <tt>G3d_getTilePtr()</tt> but does not return the pointer.
+ * Same functionality as <tt>Rast3d_getTilePtr()</tt> but does not return the pointer.
*
* \param map
* \param tileIndex
@@ -112,10 +112,10 @@
* 0 ... otherwise.
*/
-int G3d_tileLoad(RASTER3D_Map * map, int tileIndex)
+int Rast3d_tileLoad(RASTER3D_Map * map, int tileIndex)
{
- if (G3d_getTilePtr(map, tileIndex) == NULL) {
- G3d_error("G3d_tileLoad: error in G3d_getTilePtr");
+ if (Rast3d_getTilePtr(map, tileIndex) == NULL) {
+ Rast3d_error("Rast3d_tileLoad: error in Rast3d_getTilePtr");
return 0;
}
@@ -124,13 +124,13 @@
/*---------------------------------------------------------------------------*/
-int G3d__removeTile(RASTER3D_Map * map, int tileIndex)
+int Rast3d__removeTile(RASTER3D_Map * map, int tileIndex)
{
if (!map->useCache)
return 1;
- if (!G3d_cache_remove_elt(map->cache, tileIndex)) {
- G3d_error("G3d_removeTile: error in G3d_cache_remove_elt");
+ if (!Rast3d_cache_remove_elt(map->cache, tileIndex)) {
+ Rast3d_error("Rast3d_removeTile: error in Rast3d_cache_remove_elt");
return 0;
}
Modified: grass/trunk/lib/raster3d/tilemath.c
===================================================================
--- grass/trunk/lib/raster3d/tilemath.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tilemath.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -22,7 +22,7 @@
*/
void
-G3d_tileIndex2tile(RASTER3D_Map * map, int tileIndex, int *xTile, int *yTile,
+Rast3d_tileIndex2tile(RASTER3D_Map * map, int tileIndex, int *xTile, int *yTile,
int *zTile)
{
int tileIndex2d;
@@ -49,7 +49,7 @@
* \return int
*/
-int G3d_tile2tileIndex(RASTER3D_Map * map, int xTile, int yTile, int zTile)
+int Rast3d_tile2tileIndex(RASTER3D_Map * map, int xTile, int yTile, int zTile)
{
return map->nxy * zTile + map->nx * yTile + xTile;
}
@@ -75,7 +75,7 @@
*/
void
-G3d_tileCoordOrigin(RASTER3D_Map * map, int xTile, int yTile, int zTile, int *x,
+Rast3d_tileCoordOrigin(RASTER3D_Map * map, int xTile, int yTile, int zTile, int *x,
int *y, int *z)
{
*x = map->tileX * xTile;
@@ -100,12 +100,12 @@
* \return void
*/
-void G3d_tileIndexOrigin(RASTER3D_Map * map, int tileIndex, int *x, int *y, int *z)
+void Rast3d_tileIndexOrigin(RASTER3D_Map * map, int tileIndex, int *x, int *y, int *z)
{
int xTile, yTile, zTile;
- G3d_tileIndex2tile(map, tileIndex, &xTile, &yTile, &zTile);
- G3d_tileCoordOrigin(map, xTile, yTile, zTile, x, y, z);
+ Rast3d_tileIndex2tile(map, tileIndex, &xTile, &yTile, &zTile);
+ Rast3d_tileCoordOrigin(map, xTile, yTile, zTile, x, y, z);
}
/*---------------------------------------------------------------------------*/
@@ -133,7 +133,7 @@
*/
void
-G3d_coord2tileCoord(RASTER3D_Map * map, int x, int y, int z, int *xTile,
+Rast3d_coord2tileCoord(RASTER3D_Map * map, int x, int y, int z, int *xTile,
int *yTile, int *zTile, int *xOffs, int *yOffs,
int *zOffs)
{
@@ -164,14 +164,14 @@
*/
void
-G3d_coord2tileIndex(RASTER3D_Map * map, int x, int y, int z, int *tileIndex,
+Rast3d_coord2tileIndex(RASTER3D_Map * map, int x, int y, int z, int *tileIndex,
int *offset)
{
int xTile, yTile, zTile, xOffs, yOffs, zOffs;
- G3d_coord2tileCoord(map, x, y, z,
+ Rast3d_coord2tileCoord(map, x, y, z,
&xTile, &yTile, &zTile, &xOffs, &yOffs, &zOffs);
- *tileIndex = G3d_tile2tileIndex(map, xTile, yTile, zTile);
+ *tileIndex = Rast3d_tile2tileIndex(map, xTile, yTile, zTile);
*offset = zOffs * map->tileXY + yOffs * map->tileX + xOffs;
}
@@ -192,7 +192,7 @@
* \return int
*/
-int G3d_coordInRange(RASTER3D_Map * map, int x, int y, int z)
+int Rast3d_coordInRange(RASTER3D_Map * map, int x, int y, int z)
{
return (x >= 0) && (x < map->region.cols) && (y >= 0) &&
(y < map->region.rows) && (z >= 0) && (z < map->region.depths);
@@ -212,7 +212,7 @@
* \return int
*/
-int G3d_tileIndexInRange(RASTER3D_Map * map, int tileIndex)
+int Rast3d_tileIndexInRange(RASTER3D_Map * map, int tileIndex)
{
return (tileIndex < map->nTiles) && (tileIndex >= 0);
}
@@ -234,7 +234,7 @@
* \return int
*/
-int G3d_tileInRange(RASTER3D_Map * map, int x, int y, int z)
+int Rast3d_tileInRange(RASTER3D_Map * map, int x, int y, int z)
{
return (x >= 0) && (x < map->nx) && (y >= 0) && (y < map->ny) &&
(z >= 0) && (z < map->nz);
@@ -264,13 +264,13 @@
*/
int
-G3d_computeClippedTileDimensions(RASTER3D_Map * map, int tileIndex, int *rows,
+Rast3d_computeClippedTileDimensions(RASTER3D_Map * map, int tileIndex, int *rows,
int *cols, int *depths, int *xRedundant,
int *yRedundant, int *zRedundant)
{
int x, y, z;
- G3d_tileIndex2tile(map, tileIndex, &x, &y, &z);
+ Rast3d_tileIndex2tile(map, tileIndex, &x, &y, &z);
if ((x != map->clipX) && (y != map->clipY) && (z != map->clipZ)) {
return map->tileSize;
@@ -329,7 +329,7 @@
*/
void
-G3d_computeOptimalTileDimension(RASTER3D_Region *region, int type, int *tileX, int *tileY, int *tileZ, int maxSize)
+Rast3d_computeOptimalTileDimension(RASTER3D_Region *region, int type, int *tileX, int *tileY, int *tileZ, int maxSize)
{
int size = 0;
int x, y, z;
Modified: grass/trunk/lib/raster3d/tilenull.c
===================================================================
--- grass/trunk/lib/raster3d/tilenull.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tilenull.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -20,9 +20,9 @@
* \return void
*/
-void G3d_setNullTileType(RASTER3D_Map * map, void *tile, int type)
+void Rast3d_setNullTileType(RASTER3D_Map * map, void *tile, int type)
{
- G3d_setNullValue(tile, map->tileSize, type);
+ Rast3d_setNullValue(tile, map->tileSize, type);
}
/*---------------------------------------------------------------------------*/
@@ -31,14 +31,14 @@
/*!
* \brief
*
- * Is equivalent to G3d_setNullTileType (map, tile, G3d_fileTypeMap (map)).
+ * Is equivalent to Rast3d_setNullTileType (map, tile, Rast3d_fileTypeMap (map)).
*
* \param map
* \param tile
* \return void
*/
-void G3d_setNullTile(RASTER3D_Map * map, void *tile)
+void Rast3d_setNullTile(RASTER3D_Map * map, void *tile)
{
- G3d_setNullTileType(map, tile, map->typeIntern);
+ Rast3d_setNullTileType(map, tile, map->typeIntern);
}
Modified: grass/trunk/lib/raster3d/tileread.c
===================================================================
--- grass/trunk/lib/raster3d/tileread.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tileread.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -9,71 +9,71 @@
#include "raster3d_intern.h"
static int
-G3d_xdrTile2tile(RASTER3D_Map * map, void *tile, int rows, int cols, int depths,
+Rast3d_xdrTile2tile(RASTER3D_Map * map, void *tile, int rows, int cols, int depths,
int xRedundant, int yRedundant, int zRedundant, int nofNum,
int type)
{
int y, z, xLength, yLength, length;
- if (!G3d_initCopyFromXdr(map, type)) {
- G3d_error("G3d_xdrTile2tile: error in G3d_initCopyFromXdr");
+ if (!Rast3d_initCopyFromXdr(map, type)) {
+ Rast3d_error("Rast3d_xdrTile2tile: error in Rast3d_initCopyFromXdr");
return 0;
}
if (nofNum == map->tileSize) {
- if (!G3d_copyFromXdr(map->tileSize, tile)) {
- G3d_error("G3d_xdrTile2tile: error in G3d_copyFromXdr");
+ if (!Rast3d_copyFromXdr(map->tileSize, tile)) {
+ Rast3d_error("Rast3d_xdrTile2tile: error in Rast3d_copyFromXdr");
return 0;
}
return 1;
}
- length = G3d_length(type);
+ length = Rast3d_length(type);
xLength = xRedundant * length;
yLength = map->tileX * yRedundant * length;
if (xRedundant) {
for (z = 0; z < depths; z++) {
for (y = 0; y < rows; y++) {
- if (!G3d_copyFromXdr(cols, tile)) {
- G3d_error("G3d_xdrTile2tile: error in G3d_copyFromXdr");
+ if (!Rast3d_copyFromXdr(cols, tile)) {
+ Rast3d_error("Rast3d_xdrTile2tile: error in Rast3d_copyFromXdr");
return 0;
}
tile = G_incr_void_ptr(tile, cols * length);
- G3d_setNullValue(tile, xRedundant, type);
+ Rast3d_setNullValue(tile, xRedundant, type);
tile = G_incr_void_ptr(tile, xLength);
}
if (yRedundant) {
- G3d_setNullValue(tile, map->tileX * yRedundant, type);
+ Rast3d_setNullValue(tile, map->tileX * yRedundant, type);
tile = G_incr_void_ptr(tile, yLength);
}
}
if (!zRedundant)
return 1;
- G3d_setNullValue(tile, map->tileXY * zRedundant, type);
+ Rast3d_setNullValue(tile, map->tileXY * zRedundant, type);
return 1;
}
if (yRedundant) {
for (z = 0; z < depths; z++) {
- if (!G3d_copyFromXdr(map->tileX * rows, tile)) {
- G3d_error("G3d_xdrTile2tile: error in G3d_copyFromXdr");
+ if (!Rast3d_copyFromXdr(map->tileX * rows, tile)) {
+ Rast3d_error("Rast3d_xdrTile2tile: error in Rast3d_copyFromXdr");
return 0;
}
tile = G_incr_void_ptr(tile, map->tileX * rows * length);
- G3d_setNullValue(tile, map->tileX * yRedundant, type);
+ Rast3d_setNullValue(tile, map->tileX * yRedundant, type);
tile = G_incr_void_ptr(tile, yLength);
}
if (!zRedundant)
return 1;
- G3d_setNullValue(tile, map->tileXY * zRedundant, type);
+ Rast3d_setNullValue(tile, map->tileXY * zRedundant, type);
return 1;
}
- if (!G3d_copyFromXdr(map->tileXY * depths, tile)) {
- G3d_error("G3d_xdrTile2tile: error in G3d_copyFromXdr");
+ if (!Rast3d_copyFromXdr(map->tileXY * depths, tile)) {
+ Rast3d_error("Rast3d_xdrTile2tile: error in Rast3d_copyFromXdr");
return 0;
}
@@ -81,14 +81,14 @@
return 1;
tile = G_incr_void_ptr(tile, map->tileXY * depths * length);
- G3d_setNullValue(tile, map->tileXY * zRedundant, type);
+ Rast3d_setNullValue(tile, map->tileXY * zRedundant, type);
return 1;
}
/*---------------------------------------------------------------------------*/
-static int G3d_readTileUncompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
+static int Rast3d_readTileUncompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
{
int nofBytes;
@@ -96,7 +96,7 @@
nofBytes = RASTER3D_MIN(nofBytes, map->fileEndPtr - map->index[tileIndex]);
if (read(map->data_fd, xdr, nofBytes) != nofBytes) {
- G3d_error("G3d_readTileUncompressed: can't read file");
+ Rast3d_error("Rast3d_readTileUncompressed: can't read file");
return 0;
}
@@ -105,14 +105,14 @@
/*---------------------------------------------------------------------------*/
-static int G3d_readTileCompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
+static int Rast3d_readTileCompressed(RASTER3D_Map * map, int tileIndex, int nofNum)
{
if (!G_fpcompress_readXdrNums(map->data_fd, xdr, nofNum,
map->tileLength[tileIndex],
map->precision, tmpCompress,
map->type == FCELL_TYPE)) {
- G3d_error
- ("G3d_readTileCompressed: error in G_fpcompress_readXdrNums");
+ Rast3d_error
+ ("Rast3d_readTileCompressed: error in G_fpcompress_readXdrNums");
return 0;
}
@@ -144,49 +144,49 @@
* 0 ... otherwise.
*/
-int G3d_readTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
+int Rast3d_readTile(RASTER3D_Map * map, int tileIndex, void *tile, int type)
{
int nofNum, rows, cols, depths, xRedundant, yRedundant, zRedundant;
if ((tileIndex >= map->nTiles) || (tileIndex < 0))
- G3d_fatalError("G3d_readTile: tile index out of range");
+ Rast3d_fatalError("Rast3d_readTile: tile index out of range");
if (map->index[tileIndex] == -1) {
- G3d_setNullTileType(map, tile, type);
+ Rast3d_setNullTileType(map, tile, type);
return 1;
}
- nofNum = G3d_computeClippedTileDimensions(map, tileIndex,
+ nofNum = Rast3d_computeClippedTileDimensions(map, tileIndex,
&rows, &cols, &depths,
&xRedundant, &yRedundant,
&zRedundant);
if (lseek(map->data_fd, map->index[tileIndex], SEEK_SET) == -1) {
- G3d_error("G3d_readTile: can't position file");
+ Rast3d_error("Rast3d_readTile: can't position file");
return 0;
}
if (map->compression == RASTER3D_NO_COMPRESSION) {
- if (!G3d_readTileUncompressed(map, tileIndex, nofNum)) {
- G3d_error("G3d_readTile: error in G3d_readTileUncompressed");
+ if (!Rast3d_readTileUncompressed(map, tileIndex, nofNum)) {
+ Rast3d_error("Rast3d_readTile: error in Rast3d_readTileUncompressed");
return 0;
}
}
- else if (!G3d_readTileCompressed(map, tileIndex, nofNum)) {
- G3d_error("G3d_readTile: error in G3d_readTileCompressed");
+ else if (!Rast3d_readTileCompressed(map, tileIndex, nofNum)) {
+ Rast3d_error("Rast3d_readTile: error in Rast3d_readTileCompressed");
return 0;
}
- if (!G3d_xdrTile2tile(map, tile, rows, cols, depths,
+ if (!Rast3d_xdrTile2tile(map, tile, rows, cols, depths,
xRedundant, yRedundant, zRedundant, nofNum, type)) {
- G3d_error("G3d_readTile: error in G3d_xdrTile2tile");
+ Rast3d_error("Rast3d_readTile: error in Rast3d_xdrTile2tile");
return 0;
}
- if (G3d_maskIsOff(map))
+ if (Rast3d_maskIsOff(map))
return 1;
- G3d_maskTile(map, tileIndex, tile, type);
+ Rast3d_maskTile(map, tileIndex, tile, type);
return 1;
}
@@ -196,7 +196,7 @@
/*!
* \brief
*
- * Is equivalent to G3d_readTile (map, tileIndex, tile, FCELL_TYPE).
+ * Is equivalent to Rast3d_readTile (map, tileIndex, tile, FCELL_TYPE).
*
* \param map
* \param tileIndex
@@ -204,10 +204,10 @@
* \return int
*/
-int G3d_readTileFloat(RASTER3D_Map * map, int tileIndex, void *tile)
+int Rast3d_readTileFloat(RASTER3D_Map * map, int tileIndex, void *tile)
{
- if (!G3d_readTile(map, tileIndex, tile, FCELL_TYPE)) {
- G3d_error("G3d_readTileFloat: error in G3d_readTile");
+ if (!Rast3d_readTile(map, tileIndex, tile, FCELL_TYPE)) {
+ Rast3d_error("Rast3d_readTileFloat: error in Rast3d_readTile");
return 0;
}
@@ -220,7 +220,7 @@
/*!
* \brief
*
- * Is equivalent to G3d_readTile (map, tileIndex, tile, DCELL_TYPE).
+ * Is equivalent to Rast3d_readTile (map, tileIndex, tile, DCELL_TYPE).
*
* \param map
* \param tileIndex
@@ -228,10 +228,10 @@
* \return int
*/
-int G3d_readTileDouble(RASTER3D_Map * map, int tileIndex, void *tile)
+int Rast3d_readTileDouble(RASTER3D_Map * map, int tileIndex, void *tile)
{
- if (!G3d_readTile(map, tileIndex, tile, DCELL_TYPE)) {
- G3d_error("G3d_readTileDouble: error in G3d_readTile");
+ if (!Rast3d_readTile(map, tileIndex, tile, DCELL_TYPE)) {
+ Rast3d_error("Rast3d_readTileDouble: error in Rast3d_readTile");
return 0;
}
@@ -258,13 +258,13 @@
* 0 ... otherwise.
*/
-int G3d_lockTile(RASTER3D_Map * map, int tileIndex)
+int Rast3d_lockTile(RASTER3D_Map * map, int tileIndex)
{
if (!map->useCache)
- G3d_fatalError("G3d_lockTile: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_lockTile: function invalid in non-cache mode");
- if (!G3d_cache_lock(map->cache, tileIndex)) {
- G3d_error("G3d_lockTile: error in G3d_cache_lock");
+ if (!Rast3d_cache_lock(map->cache, tileIndex)) {
+ Rast3d_error("Rast3d_lockTile: error in Rast3d_cache_lock");
return 0;
}
@@ -285,13 +285,13 @@
* 0 ... otherwise.
*/
-int G3d_unlockTile(RASTER3D_Map * map, int tileIndex)
+int Rast3d_unlockTile(RASTER3D_Map * map, int tileIndex)
{
if (!map->useCache)
- G3d_fatalError("G3d_unlockTile: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_unlockTile: function invalid in non-cache mode");
- if (!G3d_cache_unlock(map->cache, tileIndex)) {
- G3d_error("G3d_unlockTile: error in G3d_cache_unlock");
+ if (!Rast3d_cache_unlock(map->cache, tileIndex)) {
+ Rast3d_error("Rast3d_unlockTile: error in Rast3d_cache_unlock");
return 0;
}
@@ -311,13 +311,13 @@
* 0 ... otherwise.
*/
-int G3d_unlockAll(RASTER3D_Map * map)
+int Rast3d_unlockAll(RASTER3D_Map * map)
{
if (!map->useCache)
- G3d_fatalError("G3d_unlockAll: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_unlockAll: function invalid in non-cache mode");
- if (!G3d_cache_unlock_all(map->cache)) {
- G3d_error("G3d_unlockAll: error in G3d_cache_unlock_all");
+ if (!Rast3d_cache_unlock_all(map->cache)) {
+ Rast3d_error("Rast3d_unlockAll: error in Rast3d_cache_unlock_all");
return 0;
}
@@ -336,12 +336,12 @@
* \return void
*/
-void G3d_autolockOn(RASTER3D_Map * map)
+void Rast3d_autolockOn(RASTER3D_Map * map)
{
if (!map->useCache)
- G3d_fatalError("G3d_autoLockOn: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_autoLockOn: function invalid in non-cache mode");
- G3d_cache_autolock_on(map->cache);
+ Rast3d_cache_autolock_on(map->cache);
}
/*---------------------------------------------------------------------------*/
@@ -356,12 +356,12 @@
* \return void
*/
-void G3d_autolockOff(RASTER3D_Map * map)
+void Rast3d_autolockOff(RASTER3D_Map * map)
{
if (!map->useCache)
- G3d_fatalError("G3d_autoLockOff: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_autoLockOff: function invalid in non-cache mode");
- G3d_cache_autolock_off(map->cache);
+ Rast3d_cache_autolock_off(map->cache);
}
/*---------------------------------------------------------------------------*/
@@ -372,11 +372,11 @@
*
* Sets the minimum
* number of unlocked tiles to <em>minUnlocked</em>. This function should be used
- * in combination with <tt>G3d_unlockAll ()</tt> in order to avoid situations where the
+ * in combination with <tt>Rast3d_unlockAll ()</tt> in order to avoid situations where the
* new minimum is larger than the actual number of unlocked tiles.
* <em>minUnlocked</em> must be one of RASTER3D_USE_CACHE_X, RASTER3D_USE_CACHE_Y,
* RASTER3D_USE_CACHE_Z, RASTER3D_USE_CACHE_XY, RASTER3D_USE_CACHE_XZ,
- * RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of G3d_cacheSizeEncode()
+ * RASTER3D_USE_CACHE_YZ, RASTER3D_USE_CACHE_XYZ, the result of Rast3d_cacheSizeEncode()
* (cf.{g3d:G3d.cacheSizeEncode}), or any positive integer
* which explicitly specifies the number of tiles.
*
@@ -385,13 +385,13 @@
* \return void
*/
-void G3d_minUnlocked(RASTER3D_Map * map, int minUnlocked)
+void Rast3d_minUnlocked(RASTER3D_Map * map, int minUnlocked)
{
if (!map->useCache)
- G3d_fatalError("G3d_autoLockOff: function invalid in non-cache mode");
+ Rast3d_fatalError("Rast3d_autoLockOff: function invalid in non-cache mode");
- G3d_cache_set_minUnlock(map->cache,
- G3d__computeCacheSize(map, minUnlocked));
+ Rast3d_cache_set_minUnlock(map->cache,
+ Rast3d__computeCacheSize(map, minUnlocked));
}
/*---------------------------------------------------------------------------*/
@@ -407,14 +407,14 @@
* 0 ... otherwise.
*/
-int G3d_beginCycle(RASTER3D_Map * map)
+int Rast3d_beginCycle(RASTER3D_Map * map)
{
- if (!G3d_unlockAll(map)) {
- G3d_fatalError("G3d_beginCycle: error in G3d_unlockAll");
+ if (!Rast3d_unlockAll(map)) {
+ Rast3d_fatalError("Rast3d_beginCycle: error in Rast3d_unlockAll");
return 0;
}
- G3d_autolockOn(map);
+ Rast3d_autolockOn(map);
return 1;
}
@@ -431,8 +431,8 @@
* 0 ... otherwise.
*/
-int G3d_endCycle(RASTER3D_Map * map)
+int Rast3d_endCycle(RASTER3D_Map * map)
{
- G3d_autolockOff(map);
+ Rast3d_autolockOff(map);
return 1;
}
Modified: grass/trunk/lib/raster3d/tilewrite.c
===================================================================
--- grass/trunk/lib/raster3d/tilewrite.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/tilewrite.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -12,21 +12,21 @@
/*---------------------------------------------------------------------------*/
static int
-G3d_tile2xdrTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
+Rast3d_tile2xdrTile(RASTER3D_Map * map, const void *tile, int rows, int cols,
int depths, int xRedundant, int yRedundant, int zRedundant,
int nofNum, int type)
{
int y, z;
- if (!G3d_initCopyToXdr(map, type)) {
- G3d_error("G3d_tile2xdrTile: error in G3d_initCopyToXdr");
+ if (!Rast3d_initCopyToXdr(map, type)) {
+ Rast3d_error("Rast3d_tile2xdrTile: error in Rast3d_initCopyToXdr");
return 0;
}
if (nofNum == map->tileSize) {
- if (!G3d_copyToXdr(tile, map->tileSize)) {
- G3d_error("G3d_tile2xdrTile: error in G3d_copyToXdr");
+ if (!Rast3d_copyToXdr(tile, map->tileSize)) {
+ Rast3d_error("Rast3d_tile2xdrTile: error in Rast3d_copyToXdr");
return 0;
}
return 1;
@@ -35,34 +35,34 @@
if (xRedundant) {
for (z = 0; z < depths; z++) {
for (y = 0; y < rows; y++) {
- if (!G3d_copyToXdr(tile, cols)) {
- G3d_error("G3d_tile2xdrTile: error in G3d_copyToXdr");
+ if (!Rast3d_copyToXdr(tile, cols)) {
+ Rast3d_error("Rast3d_tile2xdrTile: error in Rast3d_copyToXdr");
return 0;
}
- tile = G_incr_void_ptr(tile, map->tileX * G3d_length(type));
+ tile = G_incr_void_ptr(tile, map->tileX * Rast3d_length(type));
}
if (yRedundant)
tile =
G_incr_void_ptr(tile,
map->tileX * yRedundant *
- G3d_length(type));
+ Rast3d_length(type));
}
return 1;
}
if (yRedundant) {
for (z = 0; z < depths; z++) {
- if (!G3d_copyToXdr(tile, map->tileX * rows)) {
- G3d_error("G3d_tile2xdrTile: error in G3d_copyToXdr");
+ if (!Rast3d_copyToXdr(tile, map->tileX * rows)) {
+ Rast3d_error("Rast3d_tile2xdrTile: error in Rast3d_copyToXdr");
return 0;
}
- tile = G_incr_void_ptr(tile, map->tileXY * G3d_length(type));
+ tile = G_incr_void_ptr(tile, map->tileXY * Rast3d_length(type));
}
return 1;
}
- if (!G3d_copyToXdr(tile, map->tileXY * depths)) {
- G3d_error("G3d_tile2xdrTile: error in G3d_copyToXdr");
+ if (!Rast3d_copyToXdr(tile, map->tileXY * depths)) {
+ Rast3d_error("Rast3d_tile2xdrTile: error in Rast3d_copyToXdr");
return 0;
}
return 1;
@@ -70,11 +70,11 @@
/*---------------------------------------------------------------------------*/
-static int G3d_writeTileUncompressed(RASTER3D_Map * map, int nofNum)
+static int Rast3d_writeTileUncompressed(RASTER3D_Map * map, int nofNum)
{
if (write(map->data_fd, xdr, map->numLengthExtern * nofNum) !=
map->numLengthExtern * nofNum) {
- G3d_error("G3d_writeTileUncompressed: can't write file.");
+ Rast3d_error("Rast3d_writeTileUncompressed: can't write file.");
return 0;
}
@@ -83,13 +83,13 @@
/*---------------------------------------------------------------------------*/
-static int G3d_writeTileCompressed(RASTER3D_Map * map, int nofNum)
+static int Rast3d_writeTileCompressed(RASTER3D_Map * map, int nofNum)
{
if (!G_fpcompress_writeXdrNums(map->data_fd, xdr, nofNum, map->precision,
tmpCompress, map->type == FCELL_TYPE,
map->useRle, map->useLzw)) {
- G3d_error
- ("G3d_writeTileCompressed: error in G_fpcompress_writeXdrNums");
+ Rast3d_error
+ ("Rast3d_writeTileCompressed: error in G_fpcompress_writeXdrNums");
return 0;
}
@@ -127,13 +127,13 @@
* 0 ... otherwise.
*/
-int G3d_writeTile(RASTER3D_Map * map, int tileIndex, const void *tile, int type)
+int Rast3d_writeTile(RASTER3D_Map * map, int tileIndex, const void *tile, int type)
{
int rows, cols, depths, xRedundant, yRedundant, zRedundant, nofNum;
/* valid tileIndex ? */
if ((tileIndex >= map->nTiles) || (tileIndex < 0))
- G3d_fatalError("G3d_writeTile: tileIndex out of range");
+ Rast3d_fatalError("Rast3d_writeTile: tileIndex out of range");
/* already written ? */
if (map->index[tileIndex] != -1)
@@ -142,33 +142,33 @@
/* save the file position */
map->index[tileIndex] = lseek(map->data_fd, (long)0, SEEK_END);
if (map->index[tileIndex] == -1) {
- G3d_error("G3d_writeTile: can't position file");
+ Rast3d_error("Rast3d_writeTile: can't position file");
return 0;
}
- nofNum = G3d_computeClippedTileDimensions(map, tileIndex,
+ nofNum = Rast3d_computeClippedTileDimensions(map, tileIndex,
&rows, &cols, &depths,
&xRedundant, &yRedundant,
&zRedundant);
- G3d_range_updateFromTile(map, tile, rows, cols, depths,
+ Rast3d_range_updateFromTile(map, tile, rows, cols, depths,
xRedundant, yRedundant, zRedundant, nofNum,
type);
- if (!G3d_tile2xdrTile(map, tile, rows, cols, depths,
+ if (!Rast3d_tile2xdrTile(map, tile, rows, cols, depths,
xRedundant, yRedundant, zRedundant, nofNum, type)) {
- G3d_error("G3d_writeTileCompressed: error in G3d_tile2xdrTile");
+ Rast3d_error("Rast3d_writeTileCompressed: error in Rast3d_tile2xdrTile");
return 0;
}
if (map->compression == RASTER3D_NO_COMPRESSION) {
- if (!G3d_writeTileUncompressed(map, nofNum)) {
- G3d_error("G3d_writeTile: error in G3d_writeTileUncompressed");
+ if (!Rast3d_writeTileUncompressed(map, nofNum)) {
+ Rast3d_error("Rast3d_writeTile: error in Rast3d_writeTileUncompressed");
return 0;
}
}
- else if (!G3d_writeTileCompressed(map, nofNum)) {
- G3d_error("G3d_writeTile: error in G3d_writeTileCompressed");
+ else if (!Rast3d_writeTileCompressed(map, nofNum)) {
+ Rast3d_error("Rast3d_writeTile: error in Rast3d_writeTileCompressed");
return 0;
}
@@ -185,7 +185,7 @@
/*!
* \brief
*
- * Is equivalent to <tt>G3d_writeTile (map, tileIndex, tile, FCELL_TYPE).</tt>
+ * Is equivalent to <tt>Rast3d_writeTile (map, tileIndex, tile, FCELL_TYPE).</tt>
*
* \param map
* \param tileIndex
@@ -193,14 +193,14 @@
* \return int
*/
-int G3d_writeTileFloat(RASTER3D_Map * map, int tileIndex, const void *tile)
+int Rast3d_writeTileFloat(RASTER3D_Map * map, int tileIndex, const void *tile)
{
int status;
- if ((status = G3d_writeTile(map, tileIndex, tile, FCELL_TYPE)))
+ if ((status = Rast3d_writeTile(map, tileIndex, tile, FCELL_TYPE)))
return status;
- G3d_error("G3d_writeTileFloat: error in G3d_writeTile");
+ Rast3d_error("Rast3d_writeTileFloat: error in Rast3d_writeTile");
return 0;
}
@@ -210,7 +210,7 @@
/*!
* \brief
*
- * Is equivalent to <tt>G3d_writeTile (map, tileIndex, tile, DCELL_TYPE).</tt>
+ * Is equivalent to <tt>Rast3d_writeTile (map, tileIndex, tile, DCELL_TYPE).</tt>
*
* \param map
* \param tileIndex
@@ -218,14 +218,14 @@
* \return int
*/
-int G3d_writeTileDouble(RASTER3D_Map * map, int tileIndex, const void *tile)
+int Rast3d_writeTileDouble(RASTER3D_Map * map, int tileIndex, const void *tile)
{
int status;
- if ((status = G3d_writeTile(map, tileIndex, tile, DCELL_TYPE)))
+ if ((status = Rast3d_writeTile(map, tileIndex, tile, DCELL_TYPE)))
return status;
- G3d_error("G3d_writeTileDouble: error in G3d_writeTile");
+ Rast3d_error("Rast3d_writeTileDouble: error in Rast3d_writeTile");
return 0;
}
@@ -244,7 +244,7 @@
* from the cache (in non-cache mode the buffer provided by the map-structure is
* written).
* If this tile has already been written before the write request is ignored.
- * If the tile was never referred to before the invokation of G3d_flushTile, a
+ * If the tile was never referred to before the invokation of Rast3d_flushTile, a
* tile filled with NULL-values is written.
*
* \param map
@@ -253,23 +253,23 @@
* 0 ... otherwise.
*/
-int G3d_flushTile(RASTER3D_Map * map, int tileIndex)
+int Rast3d_flushTile(RASTER3D_Map * map, int tileIndex)
{
const void *tile;
- tile = G3d_getTilePtr(map, tileIndex);
+ tile = Rast3d_getTilePtr(map, tileIndex);
if (tile == NULL) {
- G3d_error("G3d_flushTile: error in G3d_getTilePtr");
+ Rast3d_error("Rast3d_flushTile: error in Rast3d_getTilePtr");
return 0;
}
- if (!G3d_writeTile(map, tileIndex, tile, map->typeIntern)) {
- G3d_error("G3d_flushTile: error in G3d_writeTile");
+ if (!Rast3d_writeTile(map, tileIndex, tile, map->typeIntern)) {
+ Rast3d_error("Rast3d_flushTile: error in Rast3d_writeTile");
return 0;
}
- if (!G3d__removeTile(map, tileIndex)) {
- G3d_error("G3d_flushTile: error in G3d__removeTile");
+ if (!Rast3d__removeTile(map, tileIndex)) {
+ Rast3d_error("Rast3d_flushTile: error in Rast3d__removeTile");
return 0;
}
@@ -305,20 +305,20 @@
*/
int
-G3d_flushTileCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
+Rast3d_flushTileCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
int yMax, int zMax)
{
int x, y, z;
if (!map->useCache)
- G3d_fatalError
- ("G3d_flushTileCube: function invalid in non-cache mode");
+ Rast3d_fatalError
+ ("Rast3d_flushTileCube: function invalid in non-cache mode");
for (x = xMin; x <= xMax; x++)
for (y = yMin; y <= yMax; y++)
for (z = zMin; z <= zMax; z++)
- if (!G3d_flushTile(map, G3d_tile2tileIndex(map, x, y, z))) {
- G3d_error("G3d_flushTileCube: error in G3d_flushTile");
+ if (!Rast3d_flushTile(map, Rast3d_tile2tileIndex(map, x, y, z))) {
+ Rast3d_error("Rast3d_flushTileCube: error in Rast3d_flushTile");
return 0;
}
@@ -351,7 +351,7 @@
*/
int
-G3d_flushTilesInCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
+Rast3d_flushTilesInCube(RASTER3D_Map * map, int xMin, int yMin, int zMin, int xMax,
int yMax, int zMax)
{
int xTileMin, yTileMin, zTileMin, xTileMax, yTileMax, zTileMax;
@@ -359,40 +359,40 @@
int regionMaxX, regionMaxY, regionMaxZ;
if (!map->useCache)
- G3d_fatalError
- ("G3d_flushTilesInCube: function invalid in non-cache mode");
+ Rast3d_fatalError
+ ("Rast3d_flushTilesInCube: function invalid in non-cache mode");
/*AV*/
/*BEGIN OF ORIGINAL CODE */
/*
- * G3d_getCoordsMap (map, ®ionMaxX, ®ionMaxY, ®ionMaxZ);
+ * Rast3d_getCoordsMap (map, ®ionMaxX, ®ionMaxY, ®ionMaxZ);
*/
/*AV*/
/* BEGIN OF MY CODE */
- G3d_getCoordsMap(map, ®ionMaxY, ®ionMaxX, ®ionMaxZ);
+ Rast3d_getCoordsMap(map, ®ionMaxY, ®ionMaxX, ®ionMaxZ);
/* END OF MY CODE */
if ((xMin < 0) && (xMax < 0))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
if ((xMin >= regionMaxX) && (xMax >= regionMaxX))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
xMin = MIN(MAX(0, xMin), regionMaxX - 1);
if ((yMin < 0) && (yMax < 0))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
if ((yMin >= regionMaxY) && (yMax >= regionMaxY))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
yMin = MIN(MAX(0, yMin), regionMaxY - 1);
if ((zMin < 0) && (zMax < 0))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
if ((zMin >= regionMaxZ) && (zMax >= regionMaxZ))
- G3d_fatalError("G3d_flushTilesInCube: coordinate out of Range");
+ Rast3d_fatalError("Rast3d_flushTilesInCube: coordinate out of Range");
zMin = MIN(MAX(0, zMin), regionMaxZ - 1);
- G3d_coord2tileCoord(map, xMin, yMin, zMin,
+ Rast3d_coord2tileCoord(map, xMin, yMin, zMin,
&xTileMin, &yTileMin, &zTileMin,
&xOffs, &yOffs, &zOffs);
@@ -403,7 +403,7 @@
if (zOffs != 0)
zTileMin++;
- G3d_coord2tileCoord(map, xMax + 1, yMax + 1, zMax + 1,
+ Rast3d_coord2tileCoord(map, xMax + 1, yMax + 1, zMax + 1,
&xTileMax, &yTileMax, &zTileMax,
&xOffs, &yOffs, &zOffs);
@@ -411,9 +411,9 @@
yTileMax--;
zTileMax--;
- if (!G3d_flushTileCube(map, xTileMin, yTileMin, zTileMin,
+ if (!Rast3d_flushTileCube(map, xTileMin, yTileMin, zTileMin,
xTileMax, yTileMax, zTileMax)) {
- G3d_error("G3d_flushTilesInCube: error in G3d_flushTileCube");
+ Rast3d_error("Rast3d_flushTilesInCube: error in Rast3d_flushTileCube");
return 0;
}
Modified: grass/trunk/lib/raster3d/volume.c
===================================================================
--- grass/trunk/lib/raster3d/volume.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/volume.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -14,23 +14,23 @@
double v[2][2][2][3];
{
- if (!(G3d_isValidLocation(map, v[0][0][0][0], v[0][0][0][1],
+ if (!(Rast3d_isValidLocation(map, v[0][0][0][0], v[0][0][0][1],
v[0][0][0][2]) &&
- G3d_isValidLocation(map, v[0][0][1][0], v[0][0][1][1],
+ Rast3d_isValidLocation(map, v[0][0][1][0], v[0][0][1][1],
v[0][0][1][2]) &&
- G3d_isValidLocation(map, v[0][1][0][0], v[0][1][0][1],
+ Rast3d_isValidLocation(map, v[0][1][0][0], v[0][1][0][1],
v[0][1][0][2]) &&
- G3d_isValidLocation(map, v[0][1][1][0], v[0][1][1][1],
+ Rast3d_isValidLocation(map, v[0][1][1][0], v[0][1][1][1],
v[0][1][1][2]) &&
- G3d_isValidLocation(map, v[1][0][0][0], v[1][0][0][1],
+ Rast3d_isValidLocation(map, v[1][0][0][0], v[1][0][0][1],
v[1][0][0][2]) &&
- G3d_isValidLocation(map, v[1][0][1][0], v[1][0][1][1],
+ Rast3d_isValidLocation(map, v[1][0][1][0], v[1][0][1][1],
v[1][0][1][2]) &&
- G3d_isValidLocation(map, v[1][1][0][0], v[1][1][0][1],
+ Rast3d_isValidLocation(map, v[1][1][0][0], v[1][1][0][1],
v[1][1][0][2]) &&
- G3d_isValidLocation(map, v[1][1][1][0], v[1][1][1][1],
+ Rast3d_isValidLocation(map, v[1][1][1][0], v[1][1][1][1],
v[1][1][1][2])))
- G3d_fatalError("verifyCubeVertices: volume vertex out of range");
+ Rast3d_fatalError("verifyCubeVertices: volume vertex out of range");
return 0;
}
@@ -43,14 +43,14 @@
{
if ((nx <= 0) || (ny <= 0) || (nz <= 0))
- G3d_fatalError("verifyCubeEdges: Volume edge out of range");
+ Rast3d_fatalError("verifyCubeEdges: Volume edge out of range");
return 0;
}
/*---------------------------------------------------------------------------*/
void
-G3d_getVolumeA(void *map, double u[2][2][2][3], int nx, int ny, int nz,
+Rast3d_getVolumeA(void *map, double u[2][2][2][3], int nx, int ny, int nz,
void *volumeBuf, int type)
{
typedef double doubleArray[3];
@@ -119,22 +119,22 @@
v[1] = t * v0[1] + tp * v1[1];
v[2] = t * v0[2] + tp * v1[2];
- G3d_location2coord2(map, v[0], v[1], v[2], &x, &y, &z);
+ Rast3d_location2coord2(map, v[0], v[1], v[2], &x, &y, &z);
/* DEBUG
printf ("(%d %d %d) (%lf %lf %lf) (%d %d %d) %lf\n",
(int) dx / 2, (int) dy / 2, (int) dz / 2,
v[0], v[1], v[2],
x, y, z,
- G3d_getDoubleRegion (map, x, y, z));
+ Rast3d_getDoubleRegion (map, x, y, z));
*/
if (type == DCELL_TYPE)
*(doubleBuf + ((int)dz / 2) * nx * ny +
((int)dy / 2) * nx + (int)dx / 2) =
-G3d_getDoubleRegion(map, x, y, z);
+Rast3d_getDoubleRegion(map, x, y, z);
else
*(floatBuf + ((int)dz / 2) * nx * ny +
((int)dy / 2) * nx + (int)dx / 2) =
-G3d_getFloatRegion(map, x, y, z);
+Rast3d_getFloatRegion(map, x, y, z);
}
}
}
@@ -143,7 +143,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_getVolume(void *map,
+Rast3d_getVolume(void *map,
double originNorth, double originWest, double originBottom,
double vxNorth, double vxWest, double vxBottom,
double vyNorth, double vyWest, double vyBottom,
@@ -184,19 +184,19 @@
u[1][1][1][1] = (u[1][0][0][1] - u[0][0][0][1]) + u[0][1][1][1];
u[1][1][1][2] = (u[1][0][0][2] - u[0][0][0][2]) + u[0][1][1][2];
- G3d_getVolumeA(map, u, nx, ny, nz, volumeBuf, type);
+ Rast3d_getVolumeA(map, u, nx, ny, nz, volumeBuf, type);
}
/*---------------------------------------------------------------------------*/
void
-G3d_getAlignedVolume(void *map,
+Rast3d_getAlignedVolume(void *map,
double originNorth, double originWest,
double originBottom, double lengthNorth,
double lengthWest, double lengthBottom, int nx, int ny,
int nz, void *volumeBuf, int type)
{
- G3d_getVolume(map,
+ Rast3d_getVolume(map,
originNorth, originWest, originBottom,
originNorth + lengthNorth, originWest, originBottom,
originNorth, originWest + lengthWest, originBottom,
@@ -207,7 +207,7 @@
/*---------------------------------------------------------------------------*/
void
-G3d_makeAlignedVolumeFile(void *map, const char *fileName,
+Rast3d_makeAlignedVolumeFile(void *map, const char *fileName,
double originNorth, double originWest,
double originBottom, double lengthNorth,
double lengthWest, double lengthBottom, int nx,
@@ -218,14 +218,14 @@
int x, y, z, eltLength;
RASTER3D_Region region;
- volumeBuf = G3d_malloc(nx * ny * nz * sizeof(G3d_getFileType()));
+ volumeBuf = Rast3d_malloc(nx * ny * nz * sizeof(Rast3d_getFileType()));
if (volumeBuf == NULL)
- G3d_fatalError("G3d_makeAlignedVolumeFile: error in G3d_malloc");
+ Rast3d_fatalError("Rast3d_makeAlignedVolumeFile: error in Rast3d_malloc");
- G3d_getAlignedVolume(map,
+ Rast3d_getAlignedVolume(map,
originNorth, originWest, originBottom,
lengthNorth, lengthWest, lengthBottom,
- nx, ny, nz, volumeBuf, G3d_getFileType());
+ nx, ny, nz, volumeBuf, Rast3d_getFileType());
region.north = originNorth;
region.south = originNorth + lengthNorth;
@@ -238,30 +238,30 @@
region.cols = nx;
region.depths = nz;
- mapVolume = G3d_openCellNew(fileName, G3d_getFileType(),
+ mapVolume = Rast3d_openCellNew(fileName, Rast3d_getFileType(),
RASTER3D_USE_CACHE_DEFAULT, ®ion);
if (mapVolume == NULL)
- G3d_fatalError("G3d_makeAlignedVolumeFile: error in G3d_openCellNew");
+ Rast3d_fatalError("Rast3d_makeAlignedVolumeFile: error in Rast3d_openCellNew");
- eltLength = G3d_length(G3d_getFileType());
+ eltLength = Rast3d_length(Rast3d_getFileType());
for (z = 0; z < nz; z++) {
for (y = 0; y < ny; y++) {
for (x = 0; x < nx; x++) {
- /* G3d_putValueRegion? */
- if (!G3d_putValue(mapVolume, x, y, z,
+ /* Rast3d_putValueRegion? */
+ if (!Rast3d_putValue(mapVolume, x, y, z,
G_incr_void_ptr(volumeBuf,
(z * ny * nx + y * nx +
x) * eltLength),
- G3d_fileTypeMap(mapVolume)))
- G3d_fatalError
- ("G3d_makeAlignedVolumeFile: error in G3d_putValue");
+ Rast3d_fileTypeMap(mapVolume)))
+ Rast3d_fatalError
+ ("Rast3d_makeAlignedVolumeFile: error in Rast3d_putValue");
}
}
}
- if (!G3d_closeCell(mapVolume))
- G3d_fatalError("G3d_makeAlignedVolumeFile: error in G3d_closeCell");
+ if (!Rast3d_closeCell(mapVolume))
+ Rast3d_fatalError("Rast3d_makeAlignedVolumeFile: error in Rast3d_closeCell");
- G3d_free(volumeBuf);
+ Rast3d_free(volumeBuf);
}
Modified: grass/trunk/lib/raster3d/window.c
===================================================================
--- grass/trunk/lib/raster3d/window.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/window.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -21,10 +21,10 @@
* \return void
*/
-void G3d_setWindowMap(RASTER3D_Map * map, RASTER3D_Region * window)
+void Rast3d_setWindowMap(RASTER3D_Map * map, RASTER3D_Region * window)
{
- G3d_regionCopy(&(map->window), window);
- G3d_adjustRegion(&(map->window));
+ Rast3d_regionCopy(&(map->window), window);
+ Rast3d_adjustRegion(&(map->window));
}
/*---------------------------------------------------------------------------*/
@@ -40,10 +40,10 @@
* \return void
*/
-void G3d_setWindow(RASTER3D_Region * window)
+void Rast3d_setWindow(RASTER3D_Region * window)
{
- G3d_regionCopy(&g3d_window, window);
- G3d_adjustRegion(&g3d_window);
+ Rast3d_regionCopy(&g3d_window, window);
+ Rast3d_adjustRegion(&g3d_window);
}
/*---------------------------------------------------------------------------*/
@@ -58,14 +58,14 @@
* \return void
*/
-void G3d_getWindow(RASTER3D_Region * window)
+void Rast3d_getWindow(RASTER3D_Region * window)
{
- G3d_regionCopy(window, &g3d_window);
+ Rast3d_regionCopy(window, &g3d_window);
}
/*---------------------------------------------------------------------------*/
-RASTER3D_Region *G3d_windowPtr()
+RASTER3D_Region *Rast3d_windowPtr()
{
return &g3d_window;
}
@@ -87,7 +87,7 @@
* \return int
*/
-int G3d_isValidLocationWindow(RASTER3D_Map * map, double north, double east, double top)
+int Rast3d_isValidLocationWindow(RASTER3D_Map * map, double north, double east, double top)
{
return ((north >= map->window.south) && (north <= map->window.north) &&
(east >= map->window.west) && (east <= map->window.east) &&
Modified: grass/trunk/lib/raster3d/windowio.c
===================================================================
--- grass/trunk/lib/raster3d/windowio.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/windowio.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -10,7 +10,7 @@
/*---------------------------------------------------------------------------*/
static int
-G3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, int *proj,
+Rast3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, int *proj,
int *zone, double *north, double *south, double *east,
double *west, double *top, double *bottom, int *rows,
int *cols, int *depths, double *ew_res, double *ns_res,
@@ -20,12 +20,12 @@
int (*windowInt) (), (*windowDouble) ();
if (doRead) {
- windowDouble = G3d_keyGetDouble;
- windowInt = G3d_keyGetInt;
+ windowDouble = Rast3d_keyGetDouble;
+ windowInt = Rast3d_keyGetInt;
}
else {
- windowDouble = G3d_keySetDouble;
- windowInt = G3d_keySetInt;
+ windowDouble = Rast3d_keySetDouble;
+ windowInt = Rast3d_keySetInt;
}
returnVal = 1;
@@ -50,7 +50,7 @@
if (returnVal)
return 1;
- G3d_error("G3d_readWriteWindow: error writing window");
+ Rast3d_error("Rast3d_readWriteWindow: error writing window");
return 0;
}
@@ -58,7 +58,7 @@
* If windowName == NULL -> RASTER3D_WINDOW_ELEMENT ("$MAPSET/WIND3")
* otherwise RASTER3D_WINDOW_DATABASE ("$MAPSET/windows3d/$NAME")
*/
-static void G3d_getFullWindowPath(char *path, const char *windowName)
+static void Rast3d_getFullWindowPath(char *path, const char *windowName)
{
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
@@ -86,7 +86,7 @@
/*---------------------------------------------------------------------------*/
/*
static void
- G3d_getWindowLocation (path, windowName)
+ Rast3d_getWindowLocation (path, windowName)
char path[1024];
char *windowName;
@@ -136,7 +136,7 @@
* 0 ... otherwise.
*/
-int G3d_readWindow(RASTER3D_Region * window, const char *windowName)
+int Rast3d_readWindow(RASTER3D_Region * window, const char *windowName)
{
struct Cell_head win;
struct Key_Value *windowKeys;
@@ -162,16 +162,16 @@
window->tb_res = win.tb_res;
}
else {
- G3d_getFullWindowPath(path, windowName);
+ Rast3d_getFullWindowPath(path, windowName);
if (access(path, R_OK) != 0) {
- G_warning("G3d_readWindow: unable to find [%s].", path);
+ G_warning("Rast3d_readWindow: unable to find [%s].", path);
return 0;
}
windowKeys = G_read_key_value_file(path);
- if (!G3d_readWriteWindow(windowKeys, 1,
+ if (!Rast3d_readWriteWindow(windowKeys, 1,
&(window->proj), &(window->zone),
&(window->north), &(window->south),
&(window->east), &(window->west),
@@ -179,8 +179,8 @@
&(window->rows), &(window->cols),
&(window->depths), &(window->ew_res),
&(window->ns_res), &(window->tb_res))) {
- G3d_error
- ("G3d_readWindow: error extracting window key(s) of file %s",
+ Rast3d_error
+ ("Rast3d_readWindow: error extracting window key(s) of file %s",
path);
return 0;
}
@@ -195,7 +195,7 @@
/* modified version of G__make_mapset_element */
/*
static int
- G3d_createPath (thePath)
+ Rast3d_createPath (thePath)
char *thePath;
@@ -250,7 +250,7 @@
/*
int
- G3d_writeWindow (window, windowName)
+ Rast3d_writeWindow (window, windowName)
RASTER3D_Region *window;
char *windowName;
@@ -273,7 +273,7 @@
* \return void
*/
-void G3d_useWindowParams(void)
+void Rast3d_useWindowParams(void)
{
- G3d_setWindowParams();
+ Rast3d_setWindowParams();
}
Modified: grass/trunk/lib/raster3d/writeascii.c
===================================================================
--- grass/trunk/lib/raster3d/writeascii.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/lib/raster3d/writeascii.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -16,7 +16,7 @@
* \return void
*/
-void G3d_writeAscii(void *map, const char *fname)
+void Rast3d_writeAscii(void *map, const char *fname)
{
FILE *fp;
DCELL d1 = 0;
@@ -25,8 +25,8 @@
int x, y, z;
int rows, cols, depths, typeIntern;
- G3d_getCoordsMap(map, &rows, &cols, &depths);
- typeIntern = G3d_tileTypeMap(map);
+ Rast3d_getCoordsMap(map, &rows, &cols, &depths);
+ typeIntern = Rast3d_tileTypeMap(map);
d1p = &d1;
f1p = (FCELL *) &d1;
@@ -34,13 +34,13 @@
if (fname == NULL)
fp = stdout;
else if ((fp = fopen(fname, "w")) == NULL)
- G3d_fatalError("G3d_writeAscii: can't open file to write\n");
+ Rast3d_fatalError("Rast3d_writeAscii: can't open file to write\n");
for (z = 0; z < depths; z++) {
for (y = 0; y < rows; y++) {
fprintf(fp, "z y x %d %d (%d - %d)\n", z, y, 0, cols - 1);
for (x = 0; x < cols; x++) {
- G3d_getValueRegion(map, x, y, z, d1p, typeIntern);
+ Rast3d_getValueRegion(map, x, y, z, d1p, typeIntern);
if (typeIntern == FCELL_TYPE)
fprintf(fp, "%.18f ", *f1p);
Modified: grass/trunk/locale/po/grasslibs_ar.po
===================================================================
--- grass/trunk/locale/po/grasslibs_ar.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_ar.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -141,11 +141,11 @@
msgstr "لم يمكن ÙتØÙ‡ %s ÙÙ‰ %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -244,59 +244,59 @@
msgstr ""
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -305,15 +305,15 @@
msgstr "خطأ: Ù…Øاولة لتØديث خريطة ليست ضمن مجموعة الخرائط الØالية"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_cs.po
===================================================================
--- grass/trunk/locale/po/grasslibs_cs.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_cs.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -148,12 +148,12 @@
msgstr "Nelze otevøít soubor <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: hodnota pøesnosti není platná"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: hodnota pøesnosti není platná"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: dimenze dla¾dic není platná"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: dimenze dla¾dic není platná"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -269,60 +269,60 @@
msgstr "nelze získat informace o historii pro [%s] v mapsetu [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: chyba v G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: chyba v Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: chyba v G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: chyba v Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: chyba v G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: chyba v G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: chyba v G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: chyba v Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: nemohu znovu natáhnoutsoubor"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: nemohu znovu natáhnoutsoubor"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: chyba v G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: chyba v Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: projekce mapy neodpovídá projekci okna"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: projekce mapy neodpovídá projekci okna"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: zóna neodpovídá zónì okna"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: zóna neodpovídá zónì okna"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: nemohu pøeèíst hlavièku"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: nemohu pøeèíst hlavièku"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: index neodpovídá typu long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: index neodpovídá typu long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: chyba v G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: chyba v Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: chyba v G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: chyba v Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: chyba v G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: chyba v Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: chyba v G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: chyba v Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -330,16 +330,16 @@
msgstr "Rastrová mapa <%s> není v aktuálním mapsetu (%s)"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: nemohu otevøít soubor"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: nemohu otevøít soubor"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: nemohu ulo¾it hlavièku"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: nemohu ulo¾it hlavièku"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: chyba v G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: chyba v Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_de.po
===================================================================
--- grass/trunk/locale/po/grasslibs_de.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_de.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -147,12 +147,12 @@
msgstr "Kann Datei %s nicht öffnen."
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: Genauigkeitswert ungültig"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: Genauigkeitswert ungültig"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: Kacheldimensionswert ungültig"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: Kacheldimensionswert ungültig"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -269,60 +269,60 @@
"Kann die History-Informationen der Karte [%s] in Mapset [%s] nicht bekommen."
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: Fehler in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: Fehler in Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: Fehler in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: Fehler in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: Fehler in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: Fehler in G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: Fehler in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: Fehler in Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: Kann Datei nicht zurücksetzen"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: Kann Datei nicht zurücksetzen"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: Fehler in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: Fehler in Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: Reprojektion passt nicht in das Fenster"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: Reprojektion passt nicht in das Fenster"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: Zone passt nicht mit der Fensterzone überein."
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: Zone passt nicht mit der Fensterzone überein."
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: Kann die Headerdatei nicht lesen."
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: Kann die Headerdatei nicht lesen."
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: Index passt nicht in das Format long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: Index passt nicht in das Format long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: Fehler in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: Fehler in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: Fehler in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: Fehler in Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: Fehlerin G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: Fehlerin Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: Fehler in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: Fehler in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -330,16 +330,16 @@
msgstr "BUG: Aktualisiere die Karte, welche nicht im aktuellen Mapset ist."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: Kann Datei nicht öffnen."
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: Kann Datei nicht öffnen."
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: Kann Header nicht schreiben"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: Kann Header nicht schreiben"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: Fehler in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: Fehler in Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_el.po
===================================================================
--- grass/trunk/locale/po/grasslibs_el.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_el.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -142,12 +142,12 @@
msgstr "Áäõíáìßá áíïßãìáôïò ôïõ áñ÷åßïõ ðïõ ðåñéÝ÷åé ôïí ðßíáêá datum <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: ç ôéìÞ áêñßâåéáò åßíáé ìç åðéôñåðôÞ"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: ç ôéìÞ áêñßâåéáò åßíáé ìç åðéôñåðôÞ"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: ç ôéìÞ tile åßíáé ìç åðéôñåðôÞ"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: ç ôéìÞ tile åßíáé ìç åðéôñåðôÞ"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -265,61 +265,61 @@
"äåäïìÝíá[%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: óöÜëìá óôï G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: óöÜëìá óôï Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: óöÜëìá óôï G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: óöÜëìá óôï Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: óöÜëìá óôï G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: óöÜëìá óôï G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "3d_openCellOld: óöÜëìá óôï G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "3d_openCellOld: óöÜëìá óôï Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: äåí åßíáé äõíáôÞ ç áíáäßðëùóç ôïõ áñ÷åßïõ"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: äåí åßíáé äõíáôÞ ç áíáäßðëùóç ôïõ áñ÷åßïõ"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: óöÜëìá óôï G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: óöÜëìá óôï Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: ç ðñïâïëÞ äåí ôáéñéÜæåé ìå ôçí ðñïâïëÞ ôïõ ðáñáèýñïõ"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: ç ðñïâïëÞ äåí ôáéñéÜæåé ìå ôçí ðñïâïëÞ ôïõ ðáñáèýñïõ"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: ç æþíç äåí ôáéñéÜæåé ìå ôç æþíç ôïõ ðáñáèýñïõ"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: ç æþíç äåí ôáéñéÜæåé ìå ôç æþíç ôïõ ðáñáèýñïõ"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
-"G3d_openCellOld: äåí åßíáé äõíáôÞ ç áíÜãíùóç ôçò êåöáëßäáò áñ÷åßïõ (header)"
+"Rast3d_openCellOld: äåí åßíáé äõíáôÞ ç áíÜãíùóç ôçò êåöáëßäáò áñ÷åßïõ (header)"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: index does not fit into long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: óöÜëìá óôï G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: óöÜëìá óôï Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: óöÜëìá óôï G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: óöÜëìá óôï Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: óöÜëìá óôï G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: óöÜëìá óôï Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: óöÜëìá óôï G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: óöÜëìá óôï Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -327,16 +327,16 @@
msgstr "Ï ñáóôåñ ÷Üñôçò <%s> äåí áíÞêåé óôï ôñÝ÷ïí mapset (%s)"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: äåí ìðïñåß íá áíïßîåé ôï áñ÷åßï"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: äåí ìðïñåß íá áíïßîåé ôï áñ÷åßï"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: äåí ìðïñåß íá ãñáöôåß ç êåöáëßäá (header)"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: äåí ìðïñåß íá ãñáöôåß ç êåöáëßäá (header)"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: óöÜëìá óôï G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: óöÜëìá óôï Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_es.po
===================================================================
--- grass/trunk/locale/po/grasslibs_es.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_es.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -149,12 +149,12 @@
msgstr "No se puede abrir el archivo <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: Valor de precisión inválido."
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: Valor de precisión inválido."
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: Valor de dimensión de mosaico no válido."
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: Valor de dimensión de mosaico no válido."
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -275,61 +275,61 @@
"de mapas de usuario (mapset) [%s]."
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: Error en G3d_maskOpenOld."
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: Error en Rast3d_maskOpenOld."
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: Error en G3d_malloc."
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: Error en Rast3d_malloc."
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: Error en G_open_old."
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: Error en G_open_old."
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: Error en G3d_openCellOldNoHeader."
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: Error en Rast3d_openCellOldNoHeader."
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: No se puede regresar al comienzo del archivo."
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: No se puede regresar al comienzo del archivo."
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: Error en G3d_readHeader."
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: Error en Rast3d_readHeader."
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
-"G3d_openCellOld: La proyección no coincide con la proyección de la ventana."
+"Rast3d_openCellOld: La proyección no coincide con la proyección de la ventana."
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: La zona no coincide con la zona de la ventana."
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: La zona no coincide con la zona de la ventana."
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: No se puede leer el encabezado."
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: No se puede leer el encabezado."
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: El índice no se ajusta a la longitud."
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: El índice no se ajusta a la longitud."
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: Error en G3d_malloc."
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: Error en Rast3d_malloc."
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: Error en G3d_fillHeader."
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: Error en Rast3d_fillHeader."
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: Error en G3d_maskOpenOld."
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: Error en Rast3d_maskOpenOld."
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: Error en G3d_malloc."
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: Error en Rast3d_malloc."
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -338,16 +338,16 @@
"El mapa raster <%s> no se encuentra en el directorio de mapas actual. (%s)"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: No se puede abrir el archivo."
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: No se puede abrir el archivo."
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: No se puede escribir el encabezado."
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: No se puede escribir el encabezado."
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: Error en G3d_fillHeader."
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: Error en Rast3d_fillHeader."
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_fr.po
===================================================================
--- grass/trunk/locale/po/grasslibs_fr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_fr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -142,12 +142,12 @@
msgstr "Impossible d'ouvrir le fichier statistique <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams : valeur de précision invalide"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams : valeur de précision invalide"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams : valeur de dimension de tuile invalide"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams : valeur de dimension de tuile invalide"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -265,62 +265,62 @@
msgstr "impossible d'obtenir l'historique pour [%s] dans le mapset [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader : erreur dans G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader : erreur dans Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader : erreur dans G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader : erreur dans Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader : erreur dans G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader : erreur dans G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld : erreur dans G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld : erreur dans Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld : impossible de recharger le fichier"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld : impossible de recharger le fichier"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld : erreur dans G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld : erreur dans Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
-"G3d_openCellOld : la projection ne correspond pas à la projection de la "
+"Rast3d_openCellOld : la projection ne correspond pas à la projection de la "
"fenêtre"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld : la zone ne correspond pas à la zone de la fenêtre"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld : la zone ne correspond pas à la zone de la fenêtre"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld : impossible de lire l'en-tête"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld : impossible de lire l'en-tête"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld : l'index ne loge pas dans un champ long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld : l'index ne loge pas dans un champ long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld : erreur dans G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld : erreur dans Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld : erreur dans G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld : erreur dans Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew : erreur dans G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew : erreur dans Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew : erreur dans G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew : erreur dans Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -328,16 +328,16 @@
msgstr "pas de fichier %s disponible dans le jeu de données actuel\n"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew : impossible d'ouvrir le fichier"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew : impossible d'ouvrir le fichier"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew : impossible d'écrire l'en-tête"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew : impossible d'écrire l'en-tête"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew : erreur dans G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew : erreur dans Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
#, fuzzy
Modified: grass/trunk/locale/po/grasslibs_hi.po
===================================================================
--- grass/trunk/locale/po/grasslibs_hi.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_hi.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -140,11 +140,11 @@
msgstr "का"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -242,59 +242,59 @@
msgstr "के लिà¤"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -303,15 +303,15 @@
msgstr "है नहीं."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_it.po
===================================================================
--- grass/trunk/locale/po/grasslibs_it.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_it.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -147,12 +147,12 @@
msgstr "Impossibile aprire il file %s in %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: valore di precisione invalido"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: valore di precisione invalido"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: valore di dimensione tile invalido"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: valore di dimensione tile invalido"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -263,61 +263,61 @@
msgstr "Non riesco a trovare lo storico per [%s] nel mapset [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: errore in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: errore in Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: errore in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: errore in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: errore in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: errore in G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: errore in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: errore in Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: impossibile riavvolgere file"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: impossibile riavvolgere file"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: errore in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: errore in Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
-"G3d_openCellOld: proiezione non corrisponde alla proiezione della finestra"
+"Rast3d_openCellOld: proiezione non corrisponde alla proiezione della finestra"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: zona non corrisponde alla zona della finestra"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: zona non corrisponde alla zona della finestra"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: impossibile leggere testata"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: impossibile leggere testata"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: indice non è adatto per long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: indice non è adatto per long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: errore in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: errore in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: errore in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: errore in Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: errore in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: errore in Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: errore in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: errore in Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -326,16 +326,16 @@
"Bug: attesa di aggiornamento di una mappa non presente nel mapset in uso"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: impossibile aprire file"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: impossibile aprire file"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: impossibile scrivere testata"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: impossibile scrivere testata"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: errore in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: errore in Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_ja.po
===================================================================
--- grass/trunk/locale/po/grasslibs_ja.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_ja.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -145,12 +145,12 @@
msgstr "���"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: 精度ã®å€¤ã¯ä¸æ£ã§ã™"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: 精度ã®å€¤ã¯ä¸æ£ã§ã™"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: タイル ディメンション値ã¯ç„¡åŠ¹ã§ã™"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: タイル ディメンション値ã¯ç„¡åŠ¹ã§ã™"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -266,60 +266,60 @@
msgstr "マップセット [%s]内ã‹ã‚‰ [%s] ã®å±¥æ´ã‚’å–得出æ¥ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: G3d_maskOpenOldã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: Rast3d_maskOpenOldã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: G3d_mallocã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: Rast3d_mallocã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: G_open_oldã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: G_open_oldã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: G3d_openCellOldNoHeaderã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: Rast3d_openCellOldNoHeaderã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: ファイルを巻ã戻ã›ã¾ã›ã‚“"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: ファイルを巻ã戻ã›ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: G3d_readHeaderã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: Rast3d_readHeaderã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: 投影ã¯ã‚¦ã‚¤ãƒ³ãƒ‰ãƒ¼æŠ•å½±ã¨ä¸€è‡´ã—ã¾ã›ã‚“"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: 投影ã¯ã‚¦ã‚¤ãƒ³ãƒ‰ãƒ¼æŠ•å½±ã¨ä¸€è‡´ã—ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: ゾーンãŒã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã‚¾ãƒ¼ãƒ³ã¨ä¸€è‡´ã—ã¾ã›ã‚“"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: ゾーンãŒã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã‚¾ãƒ¼ãƒ³ã¨ä¸€è‡´ã—ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: ヘッダーをèªã¿è¾¼ã‚ã¾ã›ã‚“"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: ヘッダーをèªã¿è¾¼ã‚ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: 索引ãŒãƒãƒ³ã‚°ã«é©åˆã—ã¾ã›ã‚“"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: 索引ãŒãƒãƒ³ã‚°ã«é©åˆã—ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: G3d_mallocã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: Rast3d_mallocã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: G3d_fillHeaderã«ãŠã‘るエラー"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: Rast3d_fillHeaderã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: G3d_maskOpenOldã«ãŠã‘るエラー"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: Rast3d_maskOpenOldã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: G3d_mallocã«ãŠã‘るエラー"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: Rast3d_mallocã«ãŠã‘るエラー"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -327,16 +327,16 @@
msgstr "���"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: ファイルを開ã‘ã¾ã›ã‚“"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: ファイルを開ã‘ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: ヘッダーを書ãè¾¼ã‚ã¾ã›ã‚“"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: ヘッダーを書ãè¾¼ã‚ã¾ã›ã‚“"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: G3d_fillHeaderã«ãŠã‘るエラー"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: Rast3d_fillHeaderã«ãŠã‘るエラー"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_ko.po
===================================================================
--- grass/trunk/locale/po/grasslibs_ko.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_ko.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -141,11 +141,11 @@
msgstr "Datum %s í…Œì´ë¸”파ì¼ì„ ì—´ 수 없습니다"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -243,59 +243,59 @@
msgstr ""
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -304,15 +304,15 @@
msgstr "'%s' 디버그파ì¼ì„ ì—´ 수 없습니다"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_lv.po
===================================================================
--- grass/trunk/locale/po/grasslibs_lv.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_lv.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -146,11 +146,11 @@
msgstr "Neiespējami atvērt failu %s iekš %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -258,59 +258,59 @@
"nevar iegÅ«t vÄ“stures informÄciju priekÅ¡ [%s] no karÅ¡u biblotÄ“kas/mapset [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -319,15 +319,15 @@
msgstr "Defekts: atteikts papildinÄt karti,kura nav tekoÅ¡ajÄ karÅ¡u komplektÄ."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_ml.po
===================================================================
--- grass/trunk/locale/po/grasslibs_ml.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_ml.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -140,11 +140,11 @@
msgstr "ടേബിൾ ഉണàµà´Ÿà´¾à´•àµà´•à´¾àµ» പറàµà´±àµà´¨àµà´¨à´¿à´²àµà´² <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -242,59 +242,59 @@
msgstr ""
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -303,15 +303,15 @@
msgstr "തെറàµà´±àµ: നിലവിലàµà´³àµà´³ മാപàµà´ªàµà´¸àµ†à´±àµà´±à´¿à´²à´¿à´²àµà´²à´¾à´¤àµà´¤ മാപàµà´ªà´¿à´¨àµ† മാറàµà´±à´‚ വരàµà´¤àµà´¤à´¾àµ» à´¶àµà´°à´®à´¿à´•àµà´•àµà´¨àµà´¨àµ"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_mr.po
===================================================================
--- grass/trunk/locale/po/grasslibs_mr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_mr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -139,11 +139,11 @@
msgstr "%s उघडता आले नाही"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -241,59 +241,59 @@
msgstr ""
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -302,15 +302,15 @@
msgstr "temp फाइल उघडता आली नाही"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_pl.po
===================================================================
--- grass/trunk/locale/po/grasslibs_pl.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_pl.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -142,12 +142,12 @@
msgstr "Nie można zapisać pliku wyjściowego <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: błędna liczba miejsc dziesiętnych"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: błędna liczba miejsc dziesiętnych"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: błędny wymiar kafli"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: błędny wymiar kafli"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -261,60 +261,60 @@
msgstr "nie można pobrać historii dla [%s] w mapsecie [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: błąd w G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: błąd w Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: błąd w G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: błąd w Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: błąd w G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: błąd w G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: błąd w G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: błąd w Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: nie można przewinąć pliku"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: nie można przewinąć pliku"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: błąd w G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: błąd w Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: odwzorowanie inne niż odwzorowanie regionu"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: odwzorowanie inne niż odwzorowanie regionu"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: strefa inna niż strefa regionu"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: strefa inna niż strefa regionu"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: nie można odczytać nagłówka"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: nie można odczytać nagłówka"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: indeks nie mieści się w long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: indeks nie mieści się w long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: błąd w G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: błąd w Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: błąd w G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: błąd w Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: błąd w G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: błąd w Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: błąd w G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: błąd w Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, c-format
@@ -322,16 +322,16 @@
msgstr "mapa <%s> nie znajduje się w bieżącym mapsecie"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: nie można otworzyć pliku"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: nie można otworzyć pliku"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: nie można zapisać nagłówka"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: nie można zapisać nagłówka"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: błąd w G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: błąd w Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_pt.po
===================================================================
--- grass/trunk/locale/po/grasslibs_pt.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_pt.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -146,12 +146,12 @@
msgstr "Impossível abrir arquivo %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: valores de precisão inválidos"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: valores de precisão inválidos"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: dimensão do recorte inválido"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: dimensão do recorte inválido"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -267,60 +267,60 @@
msgstr "não consegui obter dados históricos para [%s] no mapset [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: erro em G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: erro em Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: erro em G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: erro em G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: erro em G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: erro em G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: não posso rebobinar aquivo"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: não posso rebobinar aquivo"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: erro em G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: projeção não coincide com a projeção na janela"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: projeção não coincide com a projeção na janela"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: zona não coincide com a zona da janela"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: zona não coincide com a zona da janela"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: não consigo ler cabeçalho"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: não consigo ler cabeçalho"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: index não cabe num long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: index não cabe num long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: erro em G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: erro em G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: erro em G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: erro em Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: erro em G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -328,16 +328,16 @@
msgstr "Bug: tentativa de atualizar mapa que não está no mapset atual."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: não consegui abrir arquivo"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: não consegui abrir arquivo"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: não consegui escrever cabeçalho"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: não consegui escrever cabeçalho"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: erro em G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: erro em Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
#, fuzzy
Modified: grass/trunk/locale/po/grasslibs_pt_br.po
===================================================================
--- grass/trunk/locale/po/grasslibs_pt_br.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_pt_br.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -146,11 +146,11 @@
msgstr "não foi possível abrir o arquivo %s em %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -257,60 +257,60 @@
msgstr "não consegui obter dados históricos para [%s] no mapset [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: erro em G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: erro em Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: erro em G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: erro em G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: erro em G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: erro em G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: não posso rebobinar aquivo"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: não posso rebobinar aquivo"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: erro em G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: projeção não coincide com a projeção na janela"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: projeção não coincide com a projeção na janela"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: zona não coincide com a zona da janela"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: zona não coincide com a zona da janela"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: não consigo ler cabeçalho"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: não consigo ler cabeçalho"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: index não cabe num long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: index não cabe num long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: erro em G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: erro em G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: erro em Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: erro em G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: erro em Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: erro em G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: erro em Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -318,16 +318,16 @@
msgstr "Bug: tentativa de atualizar mapa que não está no mapset atual."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: não consegui abrir arquivo"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: não consegui abrir arquivo"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: não consegui escrever cabeçalho"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: não consegui escrever cabeçalho"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: erro em G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: erro em Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
#, fuzzy
Modified: grass/trunk/locale/po/grasslibs_ru.po
===================================================================
--- grass/trunk/locale/po/grasslibs_ru.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_ru.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -140,12 +140,12 @@
msgstr "Ðевозможно открыть файл ÑтатиÑтики <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: неправильное значение точноÑти"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: неправильное значение точноÑти"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: неправильные размеры тайлов"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: неправильные размеры тайлов"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -263,60 +263,60 @@
msgstr "невозможно прочитать иÑторию Ð´Ð»Ñ [%s] в наборе [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: ошибка в G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: ошибка в Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: ошибка в G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: ошибка в Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: ошибка в G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: ошибка в G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: ошибка в G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: ошибка в Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: невозможно перемотать файл"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: невозможно перемотать файл"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: ошибка в G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: ошибка в Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: Ð¿Ñ€Ð¾ÐµÐºÑ†Ð¸Ñ Ð½Ðµ ÑоответÑтвует проекции окна"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: Ð¿Ñ€Ð¾ÐµÐºÑ†Ð¸Ñ Ð½Ðµ ÑоответÑтвует проекции окна"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: зона не Ñовпадает Ñ Ð·Ð¾Ð½Ð¾Ð¹ окна"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: зона не Ñовпадает Ñ Ð·Ð¾Ð½Ð¾Ð¹ окна"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: невозможно прочитать заголовок"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: невозможно прочитать заголовок"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ помещаетÑÑ Ð² long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ помещаетÑÑ Ð² long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: ошибка в G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: ошибка в Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: ошибка в G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: ошибка в Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: ошибка в G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: ошибка в Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: ошибка в G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: ошибка в Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -324,16 +324,16 @@
msgstr "РаÑтрового ÑÐ»Ð¾Ñ <%s> нет в текущем наборе (%s)"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: невозможно открыть файл"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: невозможно открыть файл"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: невозможно Ñоздать заголовок"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: невозможно Ñоздать заголовок"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: ошибка в G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: ошибка в Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_sl.po
===================================================================
--- grass/trunk/locale/po/grasslibs_sl.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_sl.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -142,11 +142,11 @@
msgstr "Nezmo¾en odpreti datoteko %s v %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -254,59 +254,59 @@
msgstr "ne morem dobiti podatka \"history\" za [%s] v \"mapset\" [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -315,15 +315,15 @@
msgstr "Hro¹è: poskus posodobitve sloja, ki ni v trenutnem mapset."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_th.po
===================================================================
--- grass/trunk/locale/po/grasslibs_th.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_th.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -143,12 +143,12 @@
msgstr "ไม่สามารถระบุสภาพไฟล์ <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams:ค่าความละเà¸à¸µà¸¢à¸”ไม่ถูà¸à¸•à¹‰à¸à¸‡"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams:ค่าความละเà¸à¸µà¸¢à¸”ไม่ถูà¸à¸•à¹‰à¸à¸‡"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: มิติขà¸à¸‡ tile ไม่ถูà¸à¸•à¹‰à¸à¸‡"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: มิติขà¸à¸‡ tile ไม่ถูà¸à¸•à¹‰à¸à¸‡"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -264,60 +264,60 @@
msgstr "ไม่สามารถà¸à¹ˆà¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥ ประวัติสำหรับ [%s] ในชุดà¹à¸œà¸™à¸—ี่ [%s]"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: ข้à¸à¸œà¸´à¸”พลาดใน G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: ไม่สามารถย้à¸à¸™à¹„ฟล์à¸à¸¥à¸±à¸šà¹„ด้"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: ไม่สามารถย้à¸à¸™à¹„ฟล์à¸à¸¥à¸±à¸šà¹„ด้"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: à¸à¸²à¸£à¸‰à¸²à¸¢à¹„ม่เหมาะสมà¸à¸±à¸šà¸à¸²à¸£à¸‰à¸²à¸¢à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸™à¸µà¹‰"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: à¸à¸²à¸£à¸‰à¸²à¸¢à¹„ม่เหมาะสมà¸à¸±à¸šà¸à¸²à¸£à¸‰à¸²à¸¢à¸‚à¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸™à¸µà¹‰"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: โซนไม่เหมาะสมà¸à¸±à¸šà¹‚ซนขà¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸™à¸µà¹‰"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: โซนไม่เหมาะสมà¸à¸±à¸šà¹‚ซนขà¸à¸‡à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸™à¸µà¹‰"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: ไม่สามารถà¸à¹ˆà¸²à¸™à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¹„ด้"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: ไม่สามารถà¸à¹ˆà¸²à¸™à¸ªà¹ˆà¸§à¸™à¸«à¸±à¸§à¹„ด้"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: ค่าดัชนี à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™à¸„่าà¹à¸šà¸š long ไม่ได้"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: ค่าดัชนี à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™à¸„่าà¹à¸šà¸š long ไม่ได้"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -325,16 +325,16 @@
msgstr "ข้à¸à¸œà¸´à¸”พลาด: ตั้งใจที่จะปรับปรุงà¹à¸œà¸™à¸—ี่ ที่ไม่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸Šà¸¸à¸”à¹à¸œà¸™à¸—ี่ที่à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: ไม่สามารถเปิดไฟล์ได้"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: ไม่สามารถเปิดไฟล์ได้"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: ไม่สามารถเขียนส่วนหัวได้"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: ไม่สามารถเขียนส่วนหัวได้"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: ข้à¸à¸œà¸´à¸”พลาดใน Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
#, fuzzy
Modified: grass/trunk/locale/po/grasslibs_tr.po
===================================================================
--- grass/trunk/locale/po/grasslibs_tr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_tr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -141,11 +141,11 @@
msgstr "datum tablo dosyası açılamıyor <%s>"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../lib/g3d/g3dparam.c:143
@@ -246,59 +246,59 @@
msgstr "[%s] harita takımındaki [%s] in geçmiş bilgisi alınamıyor"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
msgstr ""
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
+msgid "Rast3d_openCellOld: can't rewind file"
msgstr ""
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
+msgid "Rast3d_openCellOld: projection does not match window projection"
msgstr ""
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
+msgid "Rast3d_openCellOld: zone does not match window zone"
msgstr ""
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
+msgid "Rast3d_openCellOld: can't read header"
msgstr ""
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
+msgid "Rast3d_openCellOld: index does not fit into long"
msgstr ""
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
msgstr ""
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
msgstr ""
#: ../lib/g3d/g3dopen.c:229
@@ -307,15 +307,15 @@
msgstr "%s dosyası geçerli harita takımında değil (%s)"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
+msgid "Rast3d_openCellNew: could not open file"
msgstr ""
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
+msgid "Rast3d_openCellNew: can't write header"
msgstr ""
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
msgstr ""
#: ../lib/vector/vedit/select.c:231
Modified: grass/trunk/locale/po/grasslibs_vi.po
===================================================================
--- grass/trunk/locale/po/grasslibs_vi.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_vi.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -143,12 +143,12 @@
msgstr "Không thể mở táºp tin %s trong %s"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: giá trị Ä‘á»™ chÃnh xác không hợp lệ"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: giá trị Ä‘á»™ chÃnh xác không hợp lệ"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: giá trị kÃch thÆ°á»›c 'tile' không hợp lệ"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: giá trị kÃch thÆ°á»›c 'tile' không hợp lệ"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -264,60 +264,60 @@
msgstr "không thể lấy thông tin lịch sỠcho [%s] trong bộ bản đồ [%s] "
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: lá»—i trong G3d_maskOpenOld"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: lá»—i trong Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: lá»—i trong G3d_malloc"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: lá»—i trong Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: lá»—i trong G_open_old"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: lá»—i trong G_open_old"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: lá»—i trong G3d_openCellOldNoHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: lá»—i trong Rast3d_openCellOldNoHeader"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: không thể tua lại táºp tin"
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: không thể tua lại táºp tin"
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: lá»—i trong G3d_readHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: lá»—i trong Rast3d_readHeader"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: phép chiếu không khá»›p vá»›i phép chiếu của cá»a sổ"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: phép chiếu không khá»›p vá»›i phép chiếu của cá»a sổ"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: múi không khá»›p vá»›i múi của cá»a sổ"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: múi không khá»›p vá»›i múi của cá»a sổ"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: không thể Ä‘á»c header"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: không thể Ä‘á»c header"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: chỉ mục không vừa và o định dạng long"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: chỉ mục không vừa và o định dạng long"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: lá»—i trong G3d_malloc"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: lá»—i trong Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: lá»—i trong G3d_fillHeader"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: lá»—i trong Rast3d_fillHeader"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: lá»—i trong G3d_maskOpenOld"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: lá»—i trong Rast3d_maskOpenOld"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr " G3d_openCellNew: lá»—i trong G3d_malloc"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr " Rast3d_openCellNew: lá»—i trong Rast3d_malloc"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -325,16 +325,16 @@
msgstr "'Bá»': cố gắng cáºp nháºt bản đồ không ở trong bá»™ bản đồ hiện tại."
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: không thể mở táºp tin"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: không thể mở táºp tin"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: không thể ghi header"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: không thể ghi header"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: lá»—i trong G3d_fillHeader"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: lá»—i trong Rast3d_fillHeader"
#: ../lib/vector/vedit/select.c:231
msgid "Unknown query tool"
Modified: grass/trunk/locale/po/grasslibs_zh.po
===================================================================
--- grass/trunk/locale/po/grasslibs_zh.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grasslibs_zh.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -144,12 +144,12 @@
msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ %s 在 %s ä¸"
#: ../lib/g3d/g3dparam.c:86
-msgid "G3d_getStandard3dParams: precision value invalid"
-msgstr "G3d_getStandard3dParams: æ— æ•ˆçš„ç²¾åº¦å€¼"
+msgid "Rast3d_getStandard3dParams: precision value invalid"
+msgstr "Rast3d_getStandard3dParams: æ— æ•ˆçš„ç²¾åº¦å€¼"
#: ../lib/g3d/g3dparam.c:119
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
-msgstr "G3d_getStandard3dParams: æ— æ•ˆçš„æ‰©å±•ç»´åº¦å€¼"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
+msgstr "Rast3d_getStandard3dParams: æ— æ•ˆçš„æ‰©å±•ç»´åº¦å€¼"
#: ../lib/g3d/g3dparam.c:143
msgid "Window replacing the default"
@@ -265,60 +265,60 @@
msgstr "æ— æ³•å¾—åˆ°[%s](在地图集[%s]ä¸)的历å²ä¿¡æ¯"
#: ../lib/g3d/g3dopen.c:20
-msgid "G3d_openCellOldNoHeader: error in G3d_maskOpenOld"
-msgstr "G3d_openCellOldNoHeader: G3d_maskOpenOld错误"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellOldNoHeader: Rast3d_maskOpenOld错误"
#: ../lib/g3d/g3dopen.c:26
-msgid "G3d_openCellOldNoHeader: error in G3d_malloc"
-msgstr "G3d_openCellOldNoHeader: G3d_malloc错误"
+msgid "Rast3d_openCellOldNoHeader: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOldNoHeader: Rast3d_malloc错误"
#: ../lib/g3d/g3dopen.c:37
-msgid "G3d_openCellOldNoHeader: error in G_open_old"
-msgstr "G3d_openCellOldNoHeader: G_open_old错误"
+msgid "Rast3d_openCellOldNoHeader: error in G_open_old"
+msgstr "Rast3d_openCellOldNoHeader: G_open_old错误"
#: ../lib/g3d/g3dopen.c:91
-msgid "G3d_openCellOld: error in G3d_openCellOldNoHeader"
-msgstr "G3d_openCellOld: G3d_openCellOldNoHeader错误"
+msgid "Rast3d_openCellOld: error in Rast3d_openCellOldNoHeader"
+msgstr "Rast3d_openCellOld: Rast3d_openCellOldNoHeader错误"
#: ../lib/g3d/g3dopen.c:96
-msgid "G3d_openCellOld: can't rewind file"
-msgstr "G3d_openCellOld: "
+msgid "Rast3d_openCellOld: can't rewind file"
+msgstr "Rast3d_openCellOld: "
#: ../lib/g3d/g3dopen.c:108
-msgid "G3d_openCellOld: error in G3d_readHeader"
-msgstr "G3d_openCellOld: G3d_readHeader错误"
+msgid "Rast3d_openCellOld: error in Rast3d_readHeader"
+msgstr "Rast3d_openCellOld: Rast3d_readHeader错误"
#: ../lib/g3d/g3dopen.c:116
-msgid "G3d_openCellOld: projection does not match window projection"
-msgstr "G3d_openCellOld: 投影类型与窗å£æŠ•å½±ç±»åž‹ä¸åŒ¹é…"
+msgid "Rast3d_openCellOld: projection does not match window projection"
+msgstr "Rast3d_openCellOld: 投影类型与窗å£æŠ•å½±ç±»åž‹ä¸åŒ¹é…"
#: ../lib/g3d/g3dopen.c:120
-msgid "G3d_openCellOld: zone does not match window zone"
-msgstr "G3d_openCellOld: 投影带与窗å£æŠ•å½±å¸¦ä¸åŒ¹é…"
+msgid "Rast3d_openCellOld: zone does not match window zone"
+msgstr "Rast3d_openCellOld: 投影带与窗å£æŠ•å½±å¸¦ä¸åŒ¹é…"
#: ../lib/g3d/g3dopen.c:132 ../lib/g3d/g3dopen.c:149
-msgid "G3d_openCellOld: can't read header"
-msgstr "G3d_openCellOld: ä¸èƒ½è¯»å–文件头"
+msgid "Rast3d_openCellOld: can't read header"
+msgstr "Rast3d_openCellOld: ä¸èƒ½è¯»å–文件头"
#: ../lib/g3d/g3dopen.c:138
-msgid "G3d_openCellOld: index does not fit into long"
-msgstr "G3d_openCellOld: 索引长度有误"
+msgid "Rast3d_openCellOld: index does not fit into long"
+msgstr "Rast3d_openCellOld: 索引长度有误"
#: ../lib/g3d/g3dopen.c:142
-msgid "G3d_openCellOld: error in G3d_malloc"
-msgstr "G3d_openCellOld: G3d_malloc错误"
+msgid "Rast3d_openCellOld: error in Rast3d_malloc"
+msgstr "Rast3d_openCellOld: Rast3d_malloc错误"
#: ../lib/g3d/g3dopen.c:168
-msgid "G3d_openCellOld: error in G3d_fillHeader"
-msgstr "G3d_openCellOld: G3d_fillHeader错误"
+msgid "Rast3d_openCellOld: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellOld: Rast3d_fillHeader错误"
#: ../lib/g3d/g3dopen.c:215
-msgid "G3d_openCellNew: error in G3d_maskOpenOld"
-msgstr "G3d_openCellNew: G3d_maskOpenOld错误"
+msgid "Rast3d_openCellNew: error in Rast3d_maskOpenOld"
+msgstr "Rast3d_openCellNew: Rast3d_maskOpenOld错误"
#: ../lib/g3d/g3dopen.c:224
-msgid "G3d_openCellNew: error in G3d_malloc"
-msgstr "G3d_openCellNew: G3d_malloc错误"
+msgid "Rast3d_openCellNew: error in Rast3d_malloc"
+msgstr "Rast3d_openCellNew: Rast3d_malloc错误"
#: ../lib/g3d/g3dopen.c:229
#, fuzzy, c-format
@@ -326,16 +326,16 @@
msgstr "错误：试图更新ä¸åœ¨å½“å‰åœ°å›¾é›†ä¸çš„地图。"
#: ../lib/g3d/g3dopen.c:239
-msgid "G3d_openCellNew: could not open file"
-msgstr "G3d_openCellNew: ä¸èƒ½æ‰“开文件"
+msgid "Rast3d_openCellNew: could not open file"
+msgstr "Rast3d_openCellNew: ä¸èƒ½æ‰“开文件"
#: ../lib/g3d/g3dopen.c:284 ../lib/g3d/g3dopen.c:289
-msgid "G3d_openCellNew: can't write header"
-msgstr "G3d_openCellNew: 文件头ä¸å¯å†™"
+msgid "Rast3d_openCellNew: can't write header"
+msgstr "Rast3d_openCellNew: 文件头ä¸å¯å†™"
#: ../lib/g3d/g3dopen.c:312
-msgid "G3d_openCellNew: error in G3d_fillHeader"
-msgstr "G3d_openCellNew: G3d_fillHeader错误"
+msgid "Rast3d_openCellNew: error in Rast3d_fillHeader"
+msgstr "Rast3d_openCellNew: Rast3d_fillHeader错误"
#: ../lib/vector/vedit/select.c:231
#, fuzzy
Modified: grass/trunk/locale/po/grassmods_ar.po
===================================================================
--- grass/trunk/locale/po/grassmods_ar.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_ar.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32923,7 +32923,7 @@
msgstr "<%s> لم يمكن ÙتØ"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_cs.po
===================================================================
--- grass/trunk/locale/po/grassmods_cs.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_cs.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33225,7 +33225,7 @@
msgstr "Nelze otevøít rastrovou mapu <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_de.po
===================================================================
--- grass/trunk/locale/po/grassmods_de.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_de.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33533,7 +33533,7 @@
msgstr "Kann die Rasterkarte <%s> nicht öffnen."
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_el.po
===================================================================
--- grass/trunk/locale/po/grassmods_el.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_el.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -31309,7 +31309,7 @@
msgstr "Áäõíáìßá áíïßãìáôïò ôïõ ÷Üñôç raster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_es.po
===================================================================
--- grass/trunk/locale/po/grassmods_es.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_es.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33453,7 +33453,7 @@
msgstr "No se puede abrir el mapa ráster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_fr.po
===================================================================
--- grass/trunk/locale/po/grassmods_fr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_fr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -35331,7 +35331,7 @@
msgstr "Impossible d'ouvrir la couche raster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_hi.po
===================================================================
--- grass/trunk/locale/po/grassmods_hi.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_hi.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33417,7 +33417,7 @@
msgstr "के लिà¤."
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_it.po
===================================================================
--- grass/trunk/locale/po/grassmods_it.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_it.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32533,7 +32533,7 @@
msgstr "Impossibile aprire la mappa raster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_ja.po
===================================================================
--- grass/trunk/locale/po/grassmods_ja.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_ja.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32585,7 +32585,7 @@
msgstr "ラスターマップ <%s> ãŒé–‹ã‘ã¾ã›ã‚“"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_ko.po
===================================================================
--- grass/trunk/locale/po/grassmods_ko.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_ko.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -31656,7 +31656,7 @@
msgstr "ì¶œë ¥í• ëž˜ìŠ¤í„°ë§µ"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_lv.po
===================================================================
--- grass/trunk/locale/po/grassmods_lv.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_lv.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32777,7 +32777,7 @@
msgstr "neiespējami atvērt <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_mr.po
===================================================================
--- grass/trunk/locale/po/grassmods_mr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_mr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -31893,7 +31893,7 @@
msgstr "'%s'. डà¥à¤°à¤¾à¤‡à¤µà¤° चालू होत नाही"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_pl.po
===================================================================
--- grass/trunk/locale/po/grassmods_pl.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_pl.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32780,7 +32780,7 @@
msgstr "Nie można otworzyć mapy rastrowej <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_pt.po
===================================================================
--- grass/trunk/locale/po/grassmods_pt.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_pt.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -34093,7 +34093,7 @@
msgstr "Não consegui abrir mapa raster [%s]."
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_pt_br.po
===================================================================
--- grass/trunk/locale/po/grassmods_pt_br.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_pt_br.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33988,7 +33988,7 @@
msgstr "Não consegui abrir mapa raster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_ru.po
===================================================================
--- grass/trunk/locale/po/grassmods_ru.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_ru.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33323,7 +33323,7 @@
msgstr "Ðевозможно открыть раÑтровый Ñлой <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_sl.po
===================================================================
--- grass/trunk/locale/po/grassmods_sl.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_sl.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33202,7 +33202,7 @@
msgstr "Ime izhodnega rastrskega sloja"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_th.po
===================================================================
--- grass/trunk/locale/po/grassmods_th.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_th.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32908,7 +32908,7 @@
msgstr "ไม่สามารถ เปิด à¹à¸œà¸™à¸—ี่เชิงภาพ <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_tr.po
===================================================================
--- grass/trunk/locale/po/grassmods_tr.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_tr.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -32029,7 +32029,7 @@
msgstr "<%s> raster haritası açılamıyor"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_vi.po
===================================================================
--- grass/trunk/locale/po/grassmods_vi.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_vi.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33313,7 +33313,7 @@
msgstr "Không thể mở bản đồ raster <%s>"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/locale/po/grassmods_zh.po
===================================================================
--- grass/trunk/locale/po/grassmods_zh.po 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/locale/po/grassmods_zh.po 2011-08-10 17:27:10 UTC (rev 47537)
@@ -33092,7 +33092,7 @@
msgstr "æ— æ³•åˆ›å»ºæ …æ ¼åœ°å›¾ %s"
#: ../raster3d/r3.retile/main.c:140
-msgid "G3d_getStandard3dParams: tile dimension value invalid"
+msgid "Rast3d_getStandard3dParams: tile dimension value invalid"
msgstr ""
#: ../raster3d/r3.info/r3.info.main.c:82
Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.colors/edit_colors.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -297,7 +297,7 @@
int stat = -1;
if (remove) {
if (type == RASTER3D_TYPE) {
- stat = G3d_removeColor(name);
+ stat = Rast3d_removeColor(name);
} else {
stat = Rast_remove_colors(name, mapset);
}
@@ -310,7 +310,7 @@
G_suppress_warnings(1);
if (type == RASTER3D_TYPE) {
- have_colors = G3d_readColors(name, mapset, &colors);
+ have_colors = Rast3d_readColors(name, mapset, &colors);
} else {
have_colors = Rast_read_colors(name, mapset, &colors);
}
@@ -328,7 +328,7 @@
if (type == RASTER3D_TYPE) {
fp = 1; /* g3d maps are always floating point */
- G3d_readRange(name, mapset, &range);
+ Rast3d_readRange(name, mapset, &range);
} else {
fp = Rast_map_is_fp(name, mapset);
Rast_read_fp_range(name, mapset, &range);
@@ -388,7 +388,7 @@
if (cmapset == NULL)
G_fatal_error(_("Raster3d map <%s> not found"), cmap);
- if (G3d_readColors(cmap, cmapset, &colors) < 0)
+ if (Rast3d_readColors(cmap, cmapset, &colors) < 0)
G_fatal_error(_("Unable to read color table for raster3d map <%s>"), cmap);
}
}
@@ -425,7 +425,7 @@
if (fp)
Rast_mark_colors_as_fp(&colors);
if (type == RASTER3D_TYPE) {
- G3d_writeColors(name, mapset, &colors);
+ Rast3d_writeColors(name, mapset, &colors);
} else {
Rast_write_colors(name, mapset, &colors);
}
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.colors/stats.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -62,13 +62,13 @@
ncols = Rast_window_cols();
} else {
/* Initiate the default settings */
- G3d_initDefaults();
+ Rast3d_initDefaults();
- map3d = G3d_openCellOld(name, mapset, RASTER3D_DEFAULT_WINDOW,
+ map3d = Rast3d_openCellOld(name, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map3d == NULL)
- G3d_fatalError(_("Error opening 3d raster map"));
+ Rast3d_fatalError(_("Error opening 3d raster map"));
nrows = map3d->window.rows;
ncols = map3d->window.cols;
@@ -126,7 +126,7 @@
if (type == RASTER_TYPE)
x = dcell[col];
else
- x = G3d_getDouble(map3d, col, row, depth);
+ x = Rast3d_getDouble(map3d, col, row, depth);
if (Rast_is_d_null_value(&x))
continue;
@@ -152,6 +152,6 @@
if(dcell)
G_free(dcell);
} else {
- G3d_closeCell(map3d);
+ Rast3d_closeCell(map3d);
}
}
Modified: grass/trunk/raster/r.colors.out/raster3d_main.c
===================================================================
--- grass/trunk/raster/r.colors.out/raster3d_main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.colors.out/raster3d_main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -55,9 +55,9 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- if (G3d_readColors(opt.map->answer, "", &colors) < 0)
+ if (Rast3d_readColors(opt.map->answer, "", &colors) < 0)
G_fatal_error(_("Unable to read color table for raster3d map <%s>"), opt.map->answer);
- G3d_readRange(opt.map->answer, "", &range);
+ Rast3d_readRange(opt.map->answer, "", &range);
write_colors(&colors, &range, opt.file->answer, flag.p->answer ? 1 : 0);
Modified: grass/trunk/raster/r.mapcalc/map3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map3.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.mapcalc/map3.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -21,8 +21,8 @@
void setup_region(void)
{
- G3d_initDefaults();
- G3d_getWindow(¤t_region3);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(¤t_region3);
rows = current_region3.rows;
columns = current_region3.cols;
@@ -74,8 +74,8 @@
for (i = 0; i < columns; i++) {
double x;
- G3d_getValue(handle, i, row, depth, (char *)&x, DCELL_TYPE);
- if (G3d_isNullValueNum(&x, DCELL_TYPE))
+ Rast3d_getValue(handle, i, row, depth, (char *)&x, DCELL_TYPE);
+ if (Rast3d_isNullValueNum(&x, DCELL_TYPE))
SET_NULL_C(&((CELL *) buf)[i]);
else
((CELL *) buf)[i] = (CELL) x;
@@ -85,8 +85,8 @@
for (i = 0; i < columns; i++) {
float x;
- G3d_getValue(handle, i, row, depth, (char *)&x, FCELL_TYPE);
- if (G3d_isNullValueNum(&x, FCELL_TYPE))
+ Rast3d_getValue(handle, i, row, depth, (char *)&x, FCELL_TYPE);
+ if (Rast3d_isNullValueNum(&x, FCELL_TYPE))
SET_NULL_F(&((FCELL *) buf)[i]);
else
((FCELL *) buf)[i] = x;
@@ -96,8 +96,8 @@
for (i = 0; i < columns; i++) {
double x;
- G3d_getValue(handle, i, row, depth, (char *)&x, DCELL_TYPE);
- if (G3d_isNullValueNum(&x, DCELL_TYPE))
+ Rast3d_getValue(handle, i, row, depth, (char *)&x, DCELL_TYPE);
+ if (Rast3d_isNullValueNum(&x, DCELL_TYPE))
SET_NULL_D(&((DCELL *) buf)[i]);
else
((DCELL *) buf)[i] = x;
@@ -117,11 +117,11 @@
double x;
if (IS_NULL_C(&((CELL *) buf)[i]))
- G3d_setNullValue(&x, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&x, 1, DCELL_TYPE);
else
x = ((CELL *) buf)[i];
- if (G3d_putValue(handle, i, row, depth, (char *)&x, DCELL_TYPE) <
+ if (Rast3d_putValue(handle, i, row, depth, (char *)&x, DCELL_TYPE) <
0)
G_fatal_error(_("Error writing data"));
}
@@ -131,11 +131,11 @@
float x;
if (IS_NULL_F(&((FCELL *) buf)[i]))
- G3d_setNullValue(&x, 1, FCELL_TYPE);
+ Rast3d_setNullValue(&x, 1, FCELL_TYPE);
else
x = ((FCELL *) buf)[i];
- if (G3d_putValue(handle, i, row, depth, (char *)&x, FCELL_TYPE) <
+ if (Rast3d_putValue(handle, i, row, depth, (char *)&x, FCELL_TYPE) <
0)
G_fatal_error(_("Error writing data"));
}
@@ -145,11 +145,11 @@
double x;
if (IS_NULL_D(&((DCELL *) buf)[i]))
- G3d_setNullValue(&x, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&x, 1, DCELL_TYPE);
else
x = ((DCELL *) buf)[i];
- if (G3d_putValue(handle, i, row, depth, (char *)&x, DCELL_TYPE) <
+ if (Rast3d_putValue(handle, i, row, depth, (char *)&x, DCELL_TYPE) <
0)
G_fatal_error(_("Error writing data"));
}
@@ -175,7 +175,7 @@
if (!set)
set = G_malloc(columns);
- if (G3d_readColors((char *)m->name, (char *)m->mapset, &m->colors) < 0)
+ if (Rast3d_readColors((char *)m->name, (char *)m->mapset, &m->colors) < 0)
G_fatal_error(_("Unable to read color file for raster map <%s@%s>"),
m->name, m->mapset);
@@ -184,7 +184,7 @@
static void init_cats(map * m)
{
- if (G3d_readCats((char *)m->name, (char *)m->mapset, &m->cats) < 0)
+ if (Rast3d_readCats((char *)m->name, (char *)m->mapset, &m->cats) < 0)
G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
m->name, m->mapset);
@@ -366,7 +366,7 @@
if (!m->handle)
return;
- if (!G3d_closeCell(m->handle))
+ if (!Rast3d_closeCell(m->handle))
G_fatal_error(_("Unable to close raster map <%s@%s>"),
m->name, m->mapset);
@@ -397,11 +397,11 @@
void *handle;
setup_region(); /* TODO: setup_region should be called by evaluate() ? */
- handle = G3d_openCellOld(tmpname, mapset, ¤t_region3,
+ handle = Rast3d_openCellOld(tmpname, mapset, ¤t_region3,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
- result = (G3d_fileTypeMap(handle) == FCELL_TYPE)
+ result = (Rast3d_fileTypeMap(handle) == FCELL_TYPE)
? FCELL_TYPE : DCELL_TYPE;
- G3d_closeCell(handle);
+ Rast3d_closeCell(handle);
}
else
result = -1;
@@ -505,7 +505,7 @@
if (use_colors)
init_colors(m);
- m->handle = G3d_openCellOld((char *)name, (char *)mapset,
+ m->handle = Rast3d_openCellOld((char *)name, (char *)mapset,
¤t_region3, DCELL_TYPE,
RASTER3D_USE_CACHE_DEFAULT);
@@ -578,9 +578,9 @@
{
void *handle;
- G3d_setFileType(res_type == FCELL_TYPE ? FCELL_TYPE : DCELL_TYPE);
+ Rast3d_setFileType(res_type == FCELL_TYPE ? FCELL_TYPE : DCELL_TYPE);
- handle = G3d_openNewOptTileSize((char *)name, RASTER3D_USE_CACHE_XYZ, ¤t_region3, res_type == FCELL_TYPE ? FCELL_TYPE : DCELL_TYPE, 32);
+ handle = Rast3d_openNewOptTileSize((char *)name, RASTER3D_USE_CACHE_XYZ, ¤t_region3, res_type == FCELL_TYPE ? FCELL_TYPE : DCELL_TYPE, 32);
if (!handle)
G_fatal_error(_("Unable to create raster map <%s>"), name);
@@ -607,7 +607,7 @@
{
void *handle = omaps[fd];
- if (!G3d_closeCell(handle))
+ if (!Rast3d_closeCell(handle))
G_fatal_error(_("Unable to close output raster map"));
}
@@ -623,10 +623,10 @@
const map *m = &maps[idx];
struct Categories cats;
- if (G3d_readCats((char *)m->name, (char *)m->mapset, &cats) < 0)
+ if (Rast3d_readCats((char *)m->name, (char *)m->mapset, &cats) < 0)
return;
- G3d_writeCats((char *)dst, &cats);
+ Rast3d_writeCats((char *)dst, &cats);
Rast_free_cats(&cats);
}
@@ -635,10 +635,10 @@
const map *m = &maps[idx];
struct Colors colr;
- if (G3d_readColors((char *)m->name, (char *)m->mapset, &colr) <= 0)
+ if (Rast3d_readColors((char *)m->name, (char *)m->mapset, &colr) <= 0)
return;
- G3d_writeColors((char *)dst, G_mapset(), &colr);
+ Rast3d_writeColors((char *)dst, G_mapset(), &colr);
Rast_free_colors(&colr);
}
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.to.rast3/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -55,8 +55,8 @@
/* Close files and exit */
if (map != NULL) {
/* should unopen map here! but this functionality is not jet implemented */
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Could not close the map"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Could not close the map"));
}
if (fd != NULL) {
@@ -64,7 +64,7 @@
close_input_raster_map(fd[i]);
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
exit(EXIT_FAILURE);
}
@@ -131,31 +131,31 @@
G_incr_void_ptr(ptr, Rast_cell_size(globalRastMapType))) {
if (globalRastMapType == CELL_TYPE) {
if (Rast_is_null_value(ptr, globalRastMapType)) {
- G3d_setNullValue(&dvalue, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&dvalue, 1, DCELL_TYPE);
} else {
dvalue = *(CELL *) ptr;
}
- if (G3d_putValue
+ if (Rast3d_putValue
(map, x, y, z, (char *) &dvalue, DCELL_TYPE) < 0)
fatal_error(map, fd, depths,
"Error writing double data");
} else if (globalRastMapType == FCELL_TYPE) {
if (Rast_is_null_value(ptr, globalRastMapType)) {
- G3d_setNullValue(&fvalue, 1, FCELL_TYPE);
+ Rast3d_setNullValue(&fvalue, 1, FCELL_TYPE);
} else {
fvalue = *(FCELL *) ptr;
}
- if (G3d_putValue
+ if (Rast3d_putValue
(map, x, y, z, (char *) &fvalue, FCELL_TYPE) < 0)
fatal_error(map, fd, depths,
"Error writing float data");
} else if (globalRastMapType == DCELL_TYPE) {
if (Rast_is_null_value(ptr, globalRastMapType)) {
- G3d_setNullValue(&dvalue, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&dvalue, 1, DCELL_TYPE);
} else {
dvalue = *(DCELL *) ptr;
}
- if (G3d_putValue
+ if (Rast3d_putValue
(map, x, y, z, (char *) &dvalue, DCELL_TYPE) < 0)
fatal_error(map, fd, depths,
"Error writing double data");
@@ -210,14 +210,14 @@
/*Check for output */
if (param.output->answer == NULL)
- G3d_fatalError(_("No output map"));
+ Rast3d_fatalError(_("No output map"));
/* Get the tile size */
maxSize = atoi(param.tilesize->answer);
/* Figure out the region from the map */
- G3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(®ion);
/*Check if the g3d-region is equal to the 2d rows and cols */
rows = Rast_window_rows();
@@ -285,17 +285,17 @@
else
globalG3dMapType = FCELL_TYPE;
- map = G3d_openNewOptTileSize(param.output->answer, RASTER3D_USE_CACHE_XY, ®ion, globalG3dMapType, maxSize);
+ map = Rast3d_openNewOptTileSize(param.output->answer, RASTER3D_USE_CACHE_XY, ®ion, globalG3dMapType, maxSize);
if (map == NULL)
fatal_error(map, fd, opencells, _("Error opening 3d raster map"));
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -306,9 +306,9 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
/*Loop over all output maps! close */
@@ -319,11 +319,11 @@
G_free(fd);
/* Flush all tile */
- if (!G3d_flushAllTiles(map))
- G3d_fatalError("Error flushing tiles with G3d_flushAllTiles");
+ if (!Rast3d_flushAllTiles(map))
+ Rast3d_fatalError("Error flushing tiles with Rast3d_flushAllTiles");
/* Close files and exit */
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Error closing 3d raster map"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Error closing 3d raster map"));
map = NULL;
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -132,8 +132,8 @@
/* Close files and exit */
if (db.map != NULL) {
/* should unopen map here! but this functionality is not jet implemented */
- if (!G3d_closeCell(db.map))
- G3d_fatalError(_("Could not close the map"));
+ if (!Rast3d_closeCell(db.map))
+ Rast3d_fatalError(_("Could not close the map"));
}
if (db.input)
@@ -142,7 +142,7 @@
if (db.elev)
close_input_raster_map(db.elev);
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
exit(EXIT_FAILURE);
}
@@ -224,7 +224,7 @@
input_rast = Rast_allocate_buf(db.inputmaptype);
elev_rast = Rast_allocate_buf(db.elevmaptype);
- G3d_setNullValue(&null, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&null, 1, DCELL_TYPE);
G_debug(3,
@@ -279,11 +279,11 @@
height <= ((z + 1) * tbres + bottom))
value = inval;
/*If the elevation is null, set the RASTER3D value null */
- if (G3d_isNullValueNum(&height, DCELL_TYPE))
+ if (Rast3d_isNullValueNum(&height, DCELL_TYPE))
value = null;
/*Write the value to the 3D map */
- if (G3d_putDouble(db.map, x, y, z, value) < 0)
+ if (Rast3d_putDouble(db.map, x, y, z, value) < 0)
fatal_error(db, _("Error writing RASTER3D double data"));
}
} else {
@@ -296,7 +296,7 @@
else if (db.useUpperVal == 2)
value = db.upper;
else
- value = G3d_getDouble(db.map, x, y, z);
+ value = Rast3d_getDouble(db.map, x, y, z);
}
/*lower cells */
if (height > ((z + 1) * tbres + bottom)) {
@@ -305,18 +305,18 @@
else if (db.useLowerVal == 2)
value = db.lower;
else
- value = G3d_getDouble(db.map, x, y, z);
+ value = Rast3d_getDouble(db.map, x, y, z);
}
/*If exactly at the border, fill upper AND lower cell */
if (height >= (z * tbres + bottom) &&
height <= ((z + 1) * tbres + bottom))
value = inval;
/*If the elevation is null, set the RASTER3D value null */
- if (G3d_isNullValueNum(&height, DCELL_TYPE))
- value = G3d_getDouble(db.map, x, y, z);
+ if (Rast3d_isNullValueNum(&height, DCELL_TYPE))
+ value = Rast3d_getDouble(db.map, x, y, z);
/*Write the value to the 3D map */
- if (G3d_putDouble(db.map, x, y, z, value) < 0)
+ if (Rast3d_putDouble(db.map, x, y, z, value) < 0)
fatal_error(db, _("Error writing RASTER3D double data"));
}
@@ -399,7 +399,7 @@
else
G_fatal_error(_("The upper value is not valid"));
} else {
- G3d_setNullValue(&db.upper, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&db.upper, 1, DCELL_TYPE);
}
/*Set the lower value */
@@ -409,12 +409,12 @@
else
G_fatal_error(_("The lower value is not valid"));
} else {
- G3d_setNullValue(&db.lower, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&db.lower, 1, DCELL_TYPE);
}
/* Figure out the current g3d region */
- G3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(®ion);
/*Check if the g3d-region is equal to the 2d rows and cols */
rows = Rast_window_rows();
@@ -437,7 +437,7 @@
/*open RASTER3D output map */
db.map = NULL;
- db.map = G3d_openNewOptTileSize(param.output->answer, RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, maxSize);
+ db.map = Rast3d_openNewOptTileSize(param.output->answer, RASTER3D_USE_CACHE_XY, ®ion, DCELL_TYPE, maxSize);
if (db.map == NULL)
fatal_error(db, _("Error opening 3d raster map"));
@@ -445,10 +445,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(db.map)) {
- G3d_maskOn(db.map);
+ if (Rast3d_maskIsOff(db.map)) {
+ Rast3d_maskOn(db.map);
changemask = 1;
}
}
@@ -487,18 +487,18 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(db.map) && changemask)
- G3d_maskOff(db.map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(db.map) && changemask)
+ Rast3d_maskOff(db.map);
}
G_debug(2, "Close 3d raster map");
/* Flush all tile */
- if (!G3d_flushAllTiles(db.map))
- G3d_fatalError("Error flushing tiles with G3d_flushAllTiles");
- if (!G3d_closeCell(db.map))
- G3d_fatalError(_("Error closing 3d raster map"));
+ if (!Rast3d_flushAllTiles(db.map))
+ Rast3d_fatalError("Error flushing tiles with Rast3d_flushAllTiles");
+ if (!Rast3d_closeCell(db.map))
+ Rast3d_fatalError(_("Error closing 3d raster map"));
G_debug(2, "\nDone\n");
Modified: grass/trunk/raster/r.univar/r3.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -108,10 +108,10 @@
exit(EXIT_FAILURE);
/* Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/* get the current region */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
cols = region.cols;
rows = region.rows;
@@ -144,24 +144,24 @@
/* open 3D zoning raster with default region */
if ((zonemap = param.zonefile->answer) != NULL) {
if (NULL == (mapset = G_find_grid3(zonemap, "")))
- G3d_fatalError(_("Requested g3d map <%s> not found"), zonemap);
+ Rast3d_fatalError(_("Requested g3d map <%s> not found"), zonemap);
zmap =
- G3d_openCellOld(zonemap, G_find_grid3(zonemap, ""), ®ion,
+ Rast3d_openCellOld(zonemap, G_find_grid3(zonemap, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (zmap == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), zonemap);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), zonemap);
- zmap_type = G3d_tileTypeMap(zmap);
+ zmap_type = Rast3d_tileTypeMap(zmap);
- if (G3d_readCats(zonemap, mapset, &(zone_info.cats)))
+ if (Rast3d_readCats(zonemap, mapset, &(zone_info.cats)))
G_warning("no category support for zoning raster");
- G3d_range_init(zmap);
- if (!G3d_range_load(zmap))
+ Rast3d_range_init(zmap);
+ if (!Rast3d_range_load(zmap))
G_fatal_error(_("Unable it load G3d range"));
- G3d_range_min_max(zmap, &dmin, &dmax);
+ Rast3d_range_min_max(zmap, &dmin, &dmax);
/* properly round dmin and dmax */
if (dmin < 0)
@@ -183,16 +183,16 @@
infile = param.inputfile->answer;
if (NULL == G_find_grid3(infile, ""))
- G3d_fatalError(_("Requested g3d map <%s> not found"), infile);
+ Rast3d_fatalError(_("Requested g3d map <%s> not found"), infile);
map =
- G3d_openCellOld(infile, G_find_grid3(infile, ""), ®ion,
+ Rast3d_openCellOld(infile, G_find_grid3(infile, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), infile);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), infile);
- map_type = G3d_tileTypeMap(map);
+ map_type = Rast3d_tileTypeMap(map);
i = 0;
while (param.percentile->answers[i])
@@ -219,8 +219,8 @@
zone = 0;
if (zone_info.n_zones) {
if (zmap_type == FCELL_TYPE) {
- G3d_getValue(zmap, x, y, z, &val_f, FCELL_TYPE);
- if (G3d_isNullValueNum(&val_f, FCELL_TYPE))
+ Rast3d_getValue(zmap, x, y, z, &val_f, FCELL_TYPE);
+ if (Rast3d_isNullValueNum(&val_f, FCELL_TYPE))
continue;
if (val_f < 0)
zone = val_f - 0.5;
@@ -228,8 +228,8 @@
zone = val_f + 0.5;
}
else if (zmap_type == DCELL_TYPE) {
- G3d_getValue(zmap, x, y, z, &val_d, DCELL_TYPE);
- if (G3d_isNullValueNum(&val_d, DCELL_TYPE))
+ Rast3d_getValue(zmap, x, y, z, &val_d, DCELL_TYPE);
+ if (Rast3d_isNullValueNum(&val_d, DCELL_TYPE))
continue;
if (val_d < 0)
zone = val_d - 0.5;
@@ -239,8 +239,8 @@
zone -= zone_info.min;
}
if (map_type == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_f, map_type);
- if (!G3d_isNullValueNum(&val_f, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_f, map_type);
+ if (!Rast3d_isNullValueNum(&val_f, map_type)) {
if (param.extended->answer) {
if (stats[zone].n >= stats[zone].n_alloc) {
size_t msize;
@@ -273,8 +273,8 @@
stats[zone].size++;
}
else if (map_type == DCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_d, map_type);
- if (!G3d_isNullValueNum(&val_d, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_d, map_type);
+ if (!Rast3d_isNullValueNum(&val_d, map_type)) {
if (param.extended->answer) {
if (stats[zone].n >= stats[zone].n_alloc) {
size_t msize;
@@ -311,9 +311,9 @@
}
/* close maps */
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
if (zone_info.n_zones)
- G3d_closeCell(zmap);
+ Rast3d_closeCell(zmap);
/* create the output */
if (param.table->answer)
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -51,8 +51,8 @@
/* Close files and exit */
if (map != NULL) {
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Could not close RASTER3D map"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Could not close RASTER3D map"));
}
/*unopen the output map */
@@ -62,7 +62,7 @@
if (elevfd != -1)
close_output_map(elevfd);
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
exit(EXIT_FAILURE);
}
@@ -136,7 +136,7 @@
depths = region.depths;
/*Typ of the RASTER3D Tile */
- typeIntern = G3d_tileTypeMap(map);
+ typeIntern = Rast3d_tileTypeMap(map);
/*Allocate mem for the output maps row */
if (typeIntern == FCELL_TYPE)
@@ -182,10 +182,10 @@
/* Get the voxel value */
if (typeIntern == FCELL_TYPE)
- G3d_getRegionValue(map, north, east, elevation, &fcell[col], FCELL_TYPE);
+ Rast3d_getRegionValue(map, north, east, elevation, &fcell[col], FCELL_TYPE);
if (typeIntern == DCELL_TYPE)
- G3d_getRegionValue(map, north, east, elevation, &dcell[col], DCELL_TYPE);
+ Rast3d_getRegionValue(map, north, east, elevation, &dcell[col], DCELL_TYPE);
}
/*Write the data to the output map */
@@ -241,12 +241,12 @@
G_debug(3, "Open 3D raster map %s", param.input->answer);
if (NULL == G_find_grid3(param.input->answer, ""))
- G3d_fatalError(_("3d raster map <%s> not found"),
+ Rast3d_fatalError(_("3d raster map <%s> not found"),
param.input->answer);
/* Figure out the region from the map */
- G3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(®ion);
/*Check if the g3d-region is equal to the 2d rows and cols */
rows = Rast_window_rows();
@@ -269,17 +269,17 @@
/*Open the 3d raster map */
/*******************/
- map = G3d_openCellOld(param.input->answer,
+ map = Rast3d_openCellOld(param.input->answer,
G_find_grid3(param.input->answer, ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening 3d raster map <%s>"),
+ Rast3d_fatalError(_("Error opening 3d raster map <%s>"),
param.input->answer);
/*Get the output type */
- output_type = G3d_fileTypeMap(map);
+ output_type = Rast3d_fileTypeMap(map);
if (output_type == FCELL_TYPE || output_type == DCELL_TYPE) {
@@ -307,10 +307,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -324,9 +324,9 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
Rast_close(outfd);
@@ -338,8 +338,8 @@
}
/* Close files and exit */
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Could not close RASTER3D map <%s>"),
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Could not close RASTER3D map <%s>"),
param.input->answer);
return (EXIT_SUCCESS);
Modified: grass/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.gwflow/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -185,10 +185,10 @@
/*Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/*get the current region */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
/*allocate the geometry structure for geometry and area calculation */
geom = N_init_geom_data_3d(®ion, geom);
@@ -364,19 +364,19 @@
depths = region->depths;
/*Open the new map */
- map = G3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, region, DCELL_TYPE, 32);
+ map = Rast3d_openNewOptTileSize(name, RASTER3D_USE_CACHE_XY, region, DCELL_TYPE, 32);
if (map == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), name);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), name);
G_message(_("Write the result to g3d map <%s>"), name);
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -398,25 +398,25 @@
d1 = N_get_array_3d_d_value(phead_start, x, y, z);
}
else {
- G3d_setNullValue(&d1, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&d1, 1, DCELL_TYPE);
}
- G3d_putDouble(map, x, y, z, d1);
+ Rast3d_putDouble(map, x, y, z, d1);
}
}
}
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
/* Flush all tile */
- if (!G3d_flushAllTiles(map))
- G3d_fatalError("Error flushing tiles with G3d_flushAllTiles");
- if (!G3d_closeCell(map))
- G3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
+ if (!Rast3d_flushAllTiles(map))
+ Rast3d_fatalError("Error flushing tiles with Rast3d_flushAllTiles");
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(map, NULL, 0, _("Error closing g3d file"));
return;
}
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -55,17 +55,17 @@
int rowOrder;
int depthOrder;
-extern void *G3d_openNewParam();
+extern void *Rast3d_openNewParam();
/*---------------------------------------------------------------------------*/
void fatalError(char *errorMsg)
{
if (map != NULL) {
/* should unopen map here! */
- G3d_closeCell(map);
+ Rast3d_closeCell(map);
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
}
/*---------------------------------------------------------------------------*/
@@ -192,7 +192,7 @@
rewind(fp);
}
- G3d_getWindow(region);
+ Rast3d_getWindow(region);
readHeaderString(fp, "north:", &(region->north));
readHeaderString(fp, "south:", &(region->south));
@@ -223,11 +223,11 @@
char buff[256];
int tileX, tileY, tileZ;
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
- G3d_autolockOn(map);
- G3d_unlockAll(map);
+ Rast3d_autolockOn(map);
+ Rast3d_unlockAll(map);
G_message(_("Loading data ... (%dx%dx%d)"), region->cols, region->rows,
region->depths);
@@ -239,7 +239,7 @@
G_percent(z, region->depths, 1);
if ((z % tileZ) == 0)
- G3d_unlockAll(map);
+ Rast3d_unlockAll(map);
for (y = 0; y < region->rows; y++) /* go south to north */
for (x = 0; x < region->cols; x++) {
@@ -270,7 +270,7 @@
/* Check for null value */
if (convertNull && strncmp(buff, nullValue, strlen(nullValue)) == 0) {
- G3d_setNullValue(&value, 1, DCELL_TYPE);
+ Rast3d_setNullValue(&value, 1, DCELL_TYPE);
} else {
if (sscanf(buff, "%lf", &value) != 1) {
G_warning(_("Invalid value detected."));
@@ -280,10 +280,10 @@
}
}
/* Write the data */
- G3d_putDouble(map, col, row, depth, value);
+ Rast3d_putDouble(map, col, row, depth, value);
}
- if (!G3d_flushTilesInCube(map,
+ if (!Rast3d_flushTilesInCube(map,
0, 0, MAX(0, depth - tileZ),
region->rows - 1, region->cols - 1, depth))
fatalError("asciiTog3d: error flushing tiles");
@@ -294,11 +294,11 @@
"expected data. [%.4f ...]"), value);
}
- if (!G3d_flushAllTiles(map))
+ if (!Rast3d_flushAllTiles(map))
fatalError("asciiTog3d: error flushing tiles");
- G3d_autolockOff(map);
- G3d_unlockAll(map);
+ Rast3d_autolockOff(map);
+ Rast3d_unlockAll(map);
G_percent(1, 1, 1);
}
@@ -329,13 +329,13 @@
_("Converts a 3D ASCII raster text file into a (binary) 3D raster map.");
setParams();
- G3d_setStandard3dInputParams();
+ Rast3d_setStandard3dInputParams();
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
getParams(&input, &output, &convertNull, nullValue);
- if (!G3d_getStandard3dParams(&useTypeDefault, &type,
+ if (!Rast3d_getStandard3dParams(&useTypeDefault, &type,
&useLzwDefault, &doLzw,
&useRleDefault, &doRle,
&usePrecisionDefault, &precision,
@@ -343,12 +343,12 @@
&tileZ))
fatalError("main: error getting standard parameters");
- G3d_initDefaults();
+ Rast3d_initDefaults();
fp = openAscii(input, ®ion);
/*Open the new RASTER3D map */
- map = G3d_openNewParam(output, RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_XY,
+ map = Rast3d_openNewParam(output, RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_XY,
®ion,
type, doLzw, doRle, precision, tileX, tileY,
tileZ);
@@ -359,13 +359,13 @@
/*Create the new RASTER3D Map */
asciiToG3d(fp, ®ion, convertNull, nullValue);
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError(_("Error closing new 3d raster map"));
/* write input name to map history */
- G3d_readHistory(output, G_mapset(), &history);
+ Rast3d_readHistory(output, G_mapset(), &history);
Rast_set_history(&history, HIST_DATSRC_1, input);
- G3d_writeHistory(output, &history);
+ Rast3d_writeHistory(output, &history);
map = NULL;
if (fclose(fp))
Modified: grass/trunk/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.v5d/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.in.v5d/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -49,7 +49,7 @@
/* should unopen map here! */
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
}
/*---------------------------------------------------------------------------*/
@@ -159,8 +159,8 @@
for (x = 0; x < region->cols; x++) {
value = data1[cnt++];
if (convertNull && (value == MISSING))
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- G3d_putFloat(map, x, y, z, value);
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ Rast3d_putFloat(map, x, y, z, value);
}
}
}
@@ -197,13 +197,13 @@
_("Import 3-dimensional Vis5D files.");
setParams();
- G3d_setStandard3dInputParams();
+ Rast3d_setStandard3dInputParams();
if (G_parser(argc, argv))
exit(1);
getParams(&input, &output, &convertNull, &nullValue);
- if (!G3d_getStandard3dParams(&useTypeDefault, &type,
+ if (!Rast3d_getStandard3dParams(&useTypeDefault, &type,
&useLzwDefault, &doLzw,
&useRleDefault, &doRle,
&usePrecisionDefault, &precision,
@@ -211,14 +211,14 @@
&tileZ))
fatalError("main: error getting standard parameters");
- G3d_getWindow(®ion);
- map = G3d_openCellNew(output, FCELL_TYPE, RASTER3D_USE_CACHE_XY, ®ion);
+ Rast3d_getWindow(®ion);
+ map = Rast3d_openCellNew(output, FCELL_TYPE, RASTER3D_USE_CACHE_XY, ®ion);
if (map == NULL)
fatalError(_("Error opening 3d raster map"));
convert(input, ®ion, convertNull, nullValue);
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError(_("Error closing 3d raster map"));
map = NULL;
Modified: grass/trunk/raster3d/r3.info/r3.info.main.c
===================================================================
--- grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -128,16 +128,16 @@
/*We need to open the map */
g3map =
- G3d_openCellOld(name, mapset, RASTER3D_DEFAULT_WINDOW,
+ Rast3d_openCellOld(name, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (NULL == g3map)
G_fatal_error(_("Unable to open 3D raster map <%s>"), name);
/*Get the maptype */
- data_type = G3d_fileTypeMap(g3map);
- head_ok = G3d_readRegionMap(name, mapset, &cellhd) >= 0;
- hist_ok = G3d_readHistory(name, mapset, &hist) >= 0;
- cats_ok = G3d_readCats(name, mapset, &cats) >= 0;
+ data_type = Rast3d_fileTypeMap(g3map);
+ head_ok = Rast3d_readRegionMap(name, mapset, &cellhd) >= 0;
+ hist_ok = Rast3d_readHistory(name, mapset, &hist) >= 0;
+ cats_ok = Rast3d_readCats(name, mapset, &cats) >= 0;
/*Check the Timestamp */
time_ok = G_read_grid3_timestamp(name, mapset, &ts) > 0;
@@ -339,10 +339,10 @@
printline(line);
else
G_fatal_error(_("Cannot allocate memory for string"));
- if (0 == G3d_range_load(g3map))
+ if (0 == Rast3d_range_load(g3map))
G_fatal_error(_("Unable to read range of 3D raster map <%s>"), name);
- G3d_range_min_max(g3map, &dmin, &dmax);
+ Rast3d_range_min_max(g3map, &dmin, &dmax);
format_double(dmin, tmp1);
format_double(dmax, tmp2);
@@ -401,10 +401,10 @@
}
else { /* Range */
if (rflag->answer) {
- if (0 == G3d_range_load(g3map))
+ if (0 == Rast3d_range_load(g3map))
G_fatal_error(_("Unable to read range of 3D raster map <%s>"), name);
- G3d_range_min_max(g3map, &dmin, &dmax);
+ Rast3d_range_min_max(g3map, &dmin, &dmax);
fprintf(out, "min=%f\n", dmin);
fprintf(out, "max=%f\n", dmax);
@@ -485,7 +485,7 @@
}
/*Close the opened map */
- if (!G3d_closeCell(g3map))
+ if (!Rast3d_closeCell(g3map))
G_fatal_error(_("Unable to close 3D raster map <%s>"), name);
Modified: grass/trunk/raster3d/r3.mask/main.c
===================================================================
--- grass/trunk/raster3d/r3.mask/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.mask/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -36,7 +36,7 @@
void getParams(char **name, d_Mask ** maskRules)
{
*name = params.map->answer;
- G3d_parse_vallist(params.maskVals->answers, maskRules);
+ Rast3d_parse_vallist(params.maskVals->answers, maskRules);
}
/*-------------------------------------------------------------------------*/
@@ -51,71 +51,71 @@
double value;
float floatNull;
- cacheSize = G3d_cacheSizeEncode(RASTER3D_USE_CACHE_XY, 1);
+ cacheSize = Rast3d_cacheSizeEncode(RASTER3D_USE_CACHE_XY, 1);
if (NULL == G_find_grid3(name, ""))
- G3d_fatalError(_("3D raster map <%s> not found"), name);
+ Rast3d_fatalError(_("3D raster map <%s> not found"), name);
- map = G3d_openCellOld(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,
DCELL_TYPE, cacheSize);
if (map == NULL)
- G3d_fatalError(_("Unable to open 3D raster map <%s>"), name);
+ Rast3d_fatalError(_("Unable to open 3D raster map <%s>"), name);
- G3d_getRegionStructMap(map, ®ion);
+ Rast3d_getRegionStructMap(map, ®ion);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- mask = G3d_openNewParam(G3d_maskFile(), FCELL_TYPE, cacheSize,
+ mask = Rast3d_openNewParam(Rast3d_maskFile(), FCELL_TYPE, cacheSize,
®ion, FCELL_TYPE, RASTER3D_NO_LZW, RASTER3D_USE_RLE, 0,
tileX, tileY, tileZ);
if (mask == NULL)
- G3d_fatalError(_("Unable to open 3D raster mask file"));
+ Rast3d_fatalError(_("Unable to open 3D raster mask file"));
- G3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
- G3d_autolockOn(map);
- G3d_unlockAll(map);
- G3d_minUnlocked(mask, RASTER3D_USE_CACHE_X);
- G3d_autolockOn(mask);
- G3d_unlockAll(mask);
+ Rast3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
+ Rast3d_autolockOn(map);
+ Rast3d_unlockAll(map);
+ Rast3d_minUnlocked(mask, RASTER3D_USE_CACHE_X);
+ Rast3d_autolockOn(mask);
+ Rast3d_unlockAll(mask);
- G3d_setNullValue(&floatNull, 1, FCELL_TYPE);
+ Rast3d_setNullValue(&floatNull, 1, FCELL_TYPE);
for (z = 0; z < region.depths; z++) {
if ((z % tileZ) == 0) {
- G3d_unlockAll(map);
- G3d_unlockAll(mask);
+ Rast3d_unlockAll(map);
+ Rast3d_unlockAll(mask);
}
for (y = 0; y < region.rows; y++) /* We count from north to south in the cube coordinate system */
for (x = 0; x < region.cols; x++) {
- value = G3d_getDoubleRegion(map, x, y, z);
- if (G3d_mask_d_select((DCELL *) & value, maskRules))
- G3d_putFloat(mask, x, y, z, (float)floatNull); /* mask-out value */
+ value = Rast3d_getDoubleRegion(map, x, y, z);
+ if (Rast3d_mask_d_select((DCELL *) & value, maskRules))
+ Rast3d_putFloat(mask, x, y, z, (float)floatNull); /* mask-out value */
else
- G3d_putFloat(mask, x, y, z, (float)0.0); /* not mask-out value */
+ Rast3d_putFloat(mask, x, y, z, (float)0.0); /* not mask-out value */
}
if ((z % tileZ) == 0) {
- if (!G3d_flushTilesInCube
+ if (!Rast3d_flushTilesInCube
(mask, 0, 0, MAX(0, z - tileZ), region.rows - 1,
region.cols - 1, z))
- G3d_fatalError(_("makeMask: error flushing tiles in cube"));
+ Rast3d_fatalError(_("makeMask: error flushing tiles in cube"));
}
}
- if (!G3d_flushAllTiles(mask))
- G3d_fatalError(_("makeMask: error flushing all tiles"));
+ if (!Rast3d_flushAllTiles(mask))
+ Rast3d_fatalError(_("makeMask: error flushing all tiles"));
- G3d_autolockOff(map);
- G3d_unlockAll(map);
- G3d_autolockOff(mask);
- G3d_unlockAll(mask);
+ Rast3d_autolockOff(map);
+ Rast3d_unlockAll(map);
+ Rast3d_autolockOff(mask);
+ Rast3d_unlockAll(mask);
- if (!G3d_closeCell(mask))
- G3d_fatalError(_("Unable to close 3D raster mask file"));
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Unable to close raster map <%s>"), name);
+ if (!Rast3d_closeCell(mask))
+ Rast3d_fatalError(_("Unable to close 3D raster mask file"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Unable to close raster map <%s>"), name);
}
/*--------------------------------------------------------------------------*/
@@ -153,7 +153,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- if (G3d_maskFileExists())
+ if (Rast3d_maskFileExists())
G_fatal_error(_("Cannot create mask file: RASTER3D_MASK already exists"));
getParams(&name, &maskRules);
Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.mkdspf/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -139,9 +139,9 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- G3d_initDefaults();
+ Rast3d_initDefaults();
- G3d_getWindow(&g3reg);
+ Rast3d_getWindow(&g3reg);
G_message(_("Region from getWindow: %d %d %d"),
g3reg.rows, g3reg.cols, g3reg.depths);
@@ -150,17 +150,17 @@
check_get_any_dspname(out->answer, name->answer, G_mapset())))
exit(EXIT_FAILURE);
- G3d_setErrorFun(G3d_printError);
+ Rast3d_setErrorFun(Rast3d_printError);
/* open g3 file for reading and writing */
if (NULL == (mapset = G_find_file2("grid3", name->answer, "")))
G_fatal_error(_("Not able to find grid3 file for [%s]"),
name->answer);
- g3map = G3d_openCellOld(name->answer, mapset, &g3reg,
+ g3map = Rast3d_openCellOld(name->answer, mapset, &g3reg,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
/*
- g3map = G3d_openCellOld (name->answer, mapset, RASTER3D_DEFAULT_WINDOW,
+ g3map = Rast3d_openCellOld (name->answer, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
*/
@@ -168,19 +168,19 @@
if (NULL == g3map)
G_fatal_error(_("Error opening grid3 file [%s]"), name->answer);
- if (0 == G3d_range_load(g3map))
+ if (0 == Rast3d_range_load(g3map))
G_fatal_error(_("Error reading range for [%s]"), name->answer);
/* TODO: look at this - should use current 3dregion rather than
region represented by original 3dgrid file */
/*
- G3d_getRegionStructMap (g3map, &g3reg);
+ Rast3d_getRegionStructMap (g3map, &g3reg);
*/
/* DONT USE Headfax any more ?
g3read_header(&Headfax);
*/
- G3d_range_min_max(g3map, &dmin, &dmax);
+ Rast3d_range_min_max(g3map, &dmin, &dmax);
viz_make_header(&Headfax, dmin, dmax, &g3reg);
/* puts command line options into cmndln_info structure */
@@ -227,7 +227,7 @@
fprintf(stderr, "\n");
/* tries to write a header! */
- G3d_closeCell(g3map);
+ Rast3d_closeCell(g3map);
fclose(Headfax.dspfoutfp);
Modified: grass/trunk/raster3d/r3.mkdspf/r3_data.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_data.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.mkdspf/r3_data.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -9,16 +9,16 @@
float *data, int n_lev)
{
#ifdef NO_RESAMPLE
- G3d_getBlock(g3map, 0, 0, n_lev,
+ Rast3d_getBlock(g3map, 0, 0, n_lev,
Headfax->xdim, Headfax->ydim, 1, (char *)data, FCELL_TYPE);
#else
- /* G3d_getBlockRegion might be handy */
+ /* Rast3d_getBlockRegion might be handy */
/*
- G3d_getAllignedVolume (map, originNorth, originWest, originBottom,
+ Rast3d_getAllignedVolume (map, originNorth, originWest, originBottom,
lengthNorth, lengthWest, lengthBottom,
nx, ny, nz, volumeBuf, type);
*/
- G3d_getAllignedVolume(g3map, g3reg->north, g3reg->west,
+ Rast3d_getAllignedVolume(g3map, g3reg->north, g3reg->west,
g3reg->top - n_lev * g3reg->tb_res,
g3reg->north - g3reg->south,
g3reg->east - g3reg->west,
Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.null/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -76,12 +76,12 @@
double *newNullVal)
{
*name = params.map->answer;
- G3d_parse_vallist(params.setNull->answers, maskRules);
+ Rast3d_parse_vallist(params.setNull->answers, maskRules);
*changeNull = (params.null->answer != NULL);
if (*changeNull)
if (sscanf(params.null->answer, "%lf", newNullVal) != 1)
- G3d_fatalError(_("Illegal value for null"));
+ Rast3d_fatalError(_("Illegal value for null"));
}
/*-------------------------------------------------------------------------*/
@@ -96,78 +96,78 @@
int doCompress, doLzw, doRle, precision;
int cacheSize;
- cacheSize = G3d_cacheSizeEncode(RASTER3D_USE_CACHE_XY, 1);
+ cacheSize = Rast3d_cacheSizeEncode(RASTER3D_USE_CACHE_XY, 1);
if (NULL == G_find_grid3(name, ""))
- G3d_fatalError(_("3D raster map <%s> not found"), name);
+ Rast3d_fatalError(_("3D raster map <%s> not found"), name);
fprintf(stderr, "name %s Mapset %s \n", name, G_mapset());
- map = G3d_openCellOld(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(name, G_mapset(), RASTER3D_DEFAULT_WINDOW,
DCELL_TYPE, cacheSize);
if (map == NULL)
- G3d_fatalError(_("Unable to open 3D raster map <%s>"), name);
+ Rast3d_fatalError(_("Unable to open 3D raster map <%s>"), name);
- G3d_getRegionStructMap(map, ®ion);
- G3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
+ Rast3d_getRegionStructMap(map, ®ion);
+ Rast3d_getTileDimensionsMap(map, &tileX, &tileY, &tileZ);
- G3d_getCompressionMode(&doCompress, &doLzw, &doRle, &precision);
+ Rast3d_getCompressionMode(&doCompress, &doLzw, &doRle, &precision);
- mapOut = G3d_openNewParam(name, DCELL_TYPE, RASTER3D_USE_CACHE_XY,
- ®ion, G3d_fileTypeMap(map),
- doLzw, doRle, G3d_tilePrecisionMap(map), tileX,
+ mapOut = Rast3d_openNewParam(name, DCELL_TYPE, RASTER3D_USE_CACHE_XY,
+ ®ion, Rast3d_fileTypeMap(map),
+ doLzw, doRle, Rast3d_tilePrecisionMap(map), tileX,
tileY, tileZ);
if (mapOut == NULL)
- G3d_fatalError(_("modifyNull: error opening tmp file"));
+ Rast3d_fatalError(_("modifyNull: error opening tmp file"));
- G3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
- G3d_autolockOn(map);
- G3d_unlockAll(map);
- G3d_minUnlocked(mapOut, RASTER3D_USE_CACHE_X);
- G3d_autolockOn(mapOut);
- G3d_unlockAll(mapOut);
+ Rast3d_minUnlocked(map, RASTER3D_USE_CACHE_X);
+ Rast3d_autolockOn(map);
+ Rast3d_unlockAll(map);
+ Rast3d_minUnlocked(mapOut, RASTER3D_USE_CACHE_X);
+ Rast3d_autolockOn(mapOut);
+ Rast3d_unlockAll(mapOut);
for (z = 0; z < region.depths; z++) {
if ((z % tileZ) == 0) {
- G3d_unlockAll(map);
- G3d_unlockAll(mapOut);
+ Rast3d_unlockAll(map);
+ Rast3d_unlockAll(mapOut);
}
for (y = 0; y < region.rows; y++)
for (x = 0; x < region.cols; x++) {
- value = G3d_getDoubleRegion(map, x, y, z);
+ value = Rast3d_getDoubleRegion(map, x, y, z);
- if (G3d_isNullValueNum(&value, DCELL_TYPE)) {
+ if (Rast3d_isNullValueNum(&value, DCELL_TYPE)) {
if (changeNull) {
value = newNullVal;
}
}
- else if (G3d_mask_d_select((DCELL *) & value, maskRules)) {
- G3d_setNullValue(&value, 1, DCELL_TYPE);
+ else if (Rast3d_mask_d_select((DCELL *) & value, maskRules)) {
+ Rast3d_setNullValue(&value, 1, DCELL_TYPE);
}
- G3d_putDouble(mapOut, x, y, z, value);
+ Rast3d_putDouble(mapOut, x, y, z, value);
}
if ((z % tileZ) == 0) {
- if (!G3d_flushTilesInCube
+ if (!Rast3d_flushTilesInCube
(mapOut, 0, 0, MAX(0, z - tileZ), region.rows - 1,
region.cols - 1, z))
- G3d_fatalError(_("modifyNull: error flushing tiles in cube"));
+ Rast3d_fatalError(_("modifyNull: error flushing tiles in cube"));
}
}
- if (!G3d_flushAllTiles(mapOut))
- G3d_fatalError(_("modifyNull: error flushing all tiles"));
+ if (!Rast3d_flushAllTiles(mapOut))
+ Rast3d_fatalError(_("modifyNull: error flushing all tiles"));
- G3d_autolockOff(map);
- G3d_unlockAll(map);
- G3d_autolockOff(mapOut);
- G3d_unlockAll(mapOut);
+ Rast3d_autolockOff(map);
+ Rast3d_unlockAll(map);
+ Rast3d_autolockOff(mapOut);
+ Rast3d_unlockAll(mapOut);
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Unable to close raster map"));
- if (!G3d_closeCell(mapOut))
- G3d_fatalError(_("modifyNull: Unable to close tmp file"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Unable to close raster map"));
+ if (!Rast3d_closeCell(mapOut))
+ Rast3d_fatalError(_("modifyNull: Unable to close tmp file"));
}
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -58,12 +58,12 @@
{
if (map != NULL) {
/* should unopen map here! */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError(_("Error closing 3d raster map"));
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
}
/*---------------------------------------------------------------------------*/
@@ -237,7 +237,7 @@
cols = region.cols;
depths = region.depths;
- typeIntern = G3d_tileTypeMap(map);
+ typeIntern = Rast3d_tileTypeMap(map);
for (z = 0; z < depths; z++) {
G_percent(z, depths, 1);
@@ -265,17 +265,17 @@
if (typeIntern == FCELL_TYPE) {
- G3d_getValue(map, col, row, depth, &fvalue, FCELL_TYPE);
+ Rast3d_getValue(map, col, row, depth, &fvalue, FCELL_TYPE);
- if (G3d_isNullValueNum(&fvalue, FCELL_TYPE))
+ if (Rast3d_isNullValueNum(&fvalue, FCELL_TYPE))
fprintf(fp, "%s ", param.null_val->answer);
else
fprintf(fp, "%.*f ", decim, fvalue);
} else {
- G3d_getValue(map, col, row, depth, &dvalue, DCELL_TYPE);
+ Rast3d_getValue(map, col, row, depth, &dvalue, DCELL_TYPE);
- if (G3d_isNullValueNum(&dvalue, DCELL_TYPE))
+ if (Rast3d_isNullValueNum(&dvalue, DCELL_TYPE))
fprintf(fp, "%s ", param.null_val->answer);
else
fprintf(fp, "%.*lf ", decim, dvalue);
@@ -327,30 +327,30 @@
}
if (NULL == G_find_grid3(input, ""))
- G3d_fatalError(_("Requested 3d raster map not found"));
+ Rast3d_fatalError(_("Requested 3d raster map not found"));
/* Initiate the default settings */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/* Figure out the current region settings */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
/* Open the map and use XY cache mode */
- map = G3d_openCellOld(input, G_find_grid3(input, ""), ®ion,
+ map = Rast3d_openCellOld(input, G_find_grid3(input, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening 3d raster map"));
+ Rast3d_fatalError(_("Error opening 3d raster map"));
/* Open the output ascii file */
fp = openAscii(output, region);
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -361,13 +361,13 @@
/*We set the Mask off, if it was off bevor */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
/* Close files and exit */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError(_("Error closing 3d raster map"));
if (output)
Modified: grass/trunk/raster3d/r3.out.v5d/BUG
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/BUG 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.v5d/BUG 2011-08-10 17:27:10 UTC (rev 47537)
@@ -10,7 +10,7 @@
RASTER3D library bug?
- G3d_getValueRegion (map, x, y, z, d1p, typeIntern);
+ Rast3d_getValueRegion (map, x, y, z, d1p, typeIntern);
produces output with different orientation comparing to:
- G3d_getValue(map, x, y, z, d1p, typeIntern);
+ Rast3d_getValue(map, x, y, z, d1p, typeIntern);
Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -50,11 +50,11 @@
{
if (map != NULL) {
/* should unopen map here! */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError("Error closing 3d raster map");
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
}
/*---------------------------------------------------------------------------*/
@@ -140,7 +140,7 @@
depths=region.depths;
*/
/* END OF ORIGINAL CODE WHICH IS NOT NECESSARY FOR ME, COMMENTED IT */
- typeIntern = G3d_tileTypeMap(map);
+ typeIntern = Rast3d_tileTypeMap(map);
G_debug(3, "cols: %i rows: %i depths: %i\n", cols, rows, depths);
@@ -225,10 +225,10 @@
for (x = 0; x < cols; x++) {
for (y = 0; y < rows; y++) { /* north to south */
- G3d_getValueRegion(map, x, y, z, d1p, typeIntern);
+ Rast3d_getValueRegion(map, x, y, z, d1p, typeIntern);
if (typeIntern == FCELL_TYPE) {
- if (G3d_isNullValueNum(f1p, FCELL_TYPE)) {
+ if (Rast3d_isNullValueNum(f1p, FCELL_TYPE)) {
g[cnt] = MISSING;
cnt++;
}
@@ -238,7 +238,7 @@
}
}
else { /*double */
- if (G3d_isNullValueNum(d1p, DCELL_TYPE)) {
+ if (Rast3d_isNullValueNum(d1p, DCELL_TYPE)) {
g[cnt] = MISSING;
cnt++;
}
@@ -309,17 +309,17 @@
trueCoords = coords->answer;
if (NULL == G_find_grid3(input, ""))
- G3d_fatalError(_("Requested 3d raster map not found"));
+ Rast3d_fatalError(_("Requested 3d raster map not found"));
- map = G3d_openCellOld(input, G_find_grid3(input, ""), RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(input, G_find_grid3(input, ""), RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (map == NULL)
- G3d_fatalError(_("Error opening 3d raster map"));
+ Rast3d_fatalError(_("Error opening 3d raster map"));
/* Use default region */
- /* G3d_getRegionStructMap(map, ®ion); */
+ /* Rast3d_getRegionStructMap(map, ®ion); */
/* Figure out the region from current settings: */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
G_debug(3, "cols: %i rows: %i layers: %i\n", region.cols, region.rows,
region.depths);
@@ -327,7 +327,7 @@
convert(output, region.rows, region.cols, region.depths, trueCoords);
/* Close files and exit */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatalError(_("Error closing 3d raster map"));
map = NULL;
Modified: grass/trunk/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -40,7 +40,7 @@
/*close all open maps and free memory */
release_input_maps_struct(in);
- G3d_fatalError("Break because of errors.");
+ Rast3d_fatalError("Break because of errors.");
}
/* ************************************************************************* */
@@ -61,7 +61,7 @@
int close_input_raster3d_map(void *map)
{
if (map != NULL) {
- if (!G3d_closeCell(map)) {
+ if (!Rast3d_closeCell(map)) {
G_warning(_("unable to close input 3d raster map"));
return 1;
}
@@ -102,7 +102,7 @@
free(in);
if (error > 0)
- G3d_fatalError("Error while closing the input maps");
+ Rast3d_fatalError("Error while closing the input maps");
return;
}
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -114,14 +114,14 @@
if (param.structgrid->answer) {
if (!param.top->answer || !param.bottom->answer)
- G3d_fatalError(_("You have to specify top and bottom map"));
+ Rast3d_fatalError(_("You have to specify top and bottom map"));
mapset = NULL;
name = NULL;
name = param.top->answer;
mapset = G_find_raster2(name, "");
if (mapset == NULL) {
- G3d_fatalError(_("Top cell map <%s> not found"),
+ Rast3d_fatalError(_("Top cell map <%s> not found"),
param.top->answer);
}
@@ -130,7 +130,7 @@
name = param.bottom->answer;
mapset = G_find_raster2(name, "");
if (mapset == NULL) {
- G3d_fatalError(_("Bottom cell map <%s> not found"),
+ Rast3d_fatalError(_("Bottom cell map <%s> not found"),
param.bottom->answer);
}
}
@@ -139,7 +139,7 @@
if (param.input->answers != NULL) {
for (i = 0; param.input->answers[i] != NULL; i++) {
if (NULL == G_find_grid3(param.input->answers[i], ""))
- G3d_fatalError(_("Requested 3d raster map <%s> not found"),
+ Rast3d_fatalError(_("Requested 3d raster map <%s> not found"),
param.input->answers[i]);
}
}
@@ -149,10 +149,10 @@
for (i = 0; i < 3; i++) {
if (param.rgbmaps->answers[i] != NULL) {
if (NULL == G_find_grid3(param.rgbmaps->answers[i], ""))
- G3d_fatalError(_("Requested g3d RGB map <%s> not found"),
+ Rast3d_fatalError(_("Requested g3d RGB map <%s> not found"),
param.rgbmaps->answers[i]);
} else {
- G3d_fatalError(_("Please provide three g3d RGB maps"));
+ Rast3d_fatalError(_("Please provide three g3d RGB maps"));
}
}
}
@@ -162,10 +162,10 @@
for (i = 0; i < 3; i++) {
if (param.vectormaps->answers[i] != NULL) {
if (NULL == G_find_grid3(param.vectormaps->answers[i], ""))
- G3d_fatalError(_("Requested g3d vector map <%s> not found"),
+ Rast3d_fatalError(_("Requested g3d vector map <%s> not found"),
param.vectormaps->answers[i]);
} else {
- G3d_fatalError(_("Please provide three g3d vector maps [x,y,z]"));
+ Rast3d_fatalError(_("Please provide three g3d vector maps [x,y,z]"));
}
}
}
@@ -199,7 +199,7 @@
maprgb = NULL;
/*Open the map */
maprgb =
- G3d_openCellOld(param.rgbmaps->answers[i],
+ Rast3d_openCellOld(param.rgbmaps->answers[i],
G_find_grid3(param.rgbmaps->answers[i], ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
@@ -211,10 +211,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask[i] = 0;
- if (G3d_maskIsOff(maprgb)) {
- G3d_maskOn(maprgb);
+ if (Rast3d_maskIsOff(maprgb)) {
+ Rast3d_maskOn(maprgb);
changemask[i] = 1;
}
}
@@ -243,12 +243,12 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(maprgb) && changemask[i])
- G3d_maskOff(maprgb);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(maprgb) && changemask[i])
+ Rast3d_maskOff(maprgb);
}
/* Close the 3d raster map */
- if (!G3d_closeCell(maprgb)) {
+ if (!Rast3d_closeCell(maprgb)) {
fatal_error(_("Error closing g3d rgb map."), in);
}
@@ -284,7 +284,7 @@
mapvect = NULL;
/*Open the map */
mapvect =
- G3d_openCellOld(param.vectormaps->answers[i],
+ Rast3d_openCellOld(param.vectormaps->answers[i],
G_find_grid3(param.vectormaps->answers[i],
""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
@@ -296,10 +296,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask[i] = 0;
- if (G3d_maskIsOff(mapvect)) {
- G3d_maskOn(mapvect);
+ if (Rast3d_maskIsOff(mapvect)) {
+ Rast3d_maskOn(mapvect);
changemask[i] = 1;
}
}
@@ -328,13 +328,13 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(mapvect) && changemask[i])
- G3d_maskOff(mapvect);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(mapvect) && changemask[i])
+ Rast3d_maskOff(mapvect);
}
/* Close the 3d raster map */
- if (!G3d_closeCell(mapvect)) {
+ if (!Rast3d_closeCell(mapvect)) {
fatal_error(_("Error closing g3d vector map."), in);
}
/*Set the pointer to null so we know later that these files are already closed */
@@ -423,8 +423,8 @@
fp = stdout;
/* Figure out the region from the map */
- G3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_initDefaults();
+ Rast3d_getWindow(®ion);
/*initiate the input mpas structure */
in = create_input_maps_struct();
@@ -503,7 +503,7 @@
/*Open the map */
in->map =
- G3d_openCellOld(param.input->answers[i],
+ Rast3d_openCellOld(param.input->answers[i],
G_find_grid3(param.input->answers[i], ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
@@ -515,10 +515,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(in->map)) {
- G3d_maskOn(in->map);
+ if (Rast3d_maskIsOff(in->map)) {
+ Rast3d_maskOn(in->map);
changemask = 1;
}
}
@@ -529,13 +529,13 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(in->map) && changemask)
- G3d_maskOff(in->map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(in->map) && changemask)
+ Rast3d_maskOff(in->map);
}
/* Close the 3d raster map */
- if (!G3d_closeCell(in->map)) {
+ if (!Rast3d_closeCell(in->map)) {
in->map = NULL;
fatal_error(_("Error closing 3d raster map, the VTK file may be incomplete."),
in);
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -79,14 +79,14 @@
double dvalue;
if (type == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &fvalue, type);
- if (G3d_isNullValueNum(&fvalue, FCELL_TYPE))
+ Rast3d_getValue(map, x, y, z, &fvalue, type);
+ if (Rast3d_isNullValueNum(&fvalue, FCELL_TYPE))
val = nullval;
else
val = (double) fvalue;
} else {
- G3d_getValue(map, x, y, z, &dvalue, type);
- if (G3d_isNullValueNum(&dvalue, DCELL_TYPE))
+ Rast3d_getValue(map, x, y, z, &dvalue, type);
+ if (Rast3d_isNullValueNum(&dvalue, DCELL_TYPE))
val = nullval;
else
val = dvalue;
@@ -338,7 +338,7 @@
fprintf(fp, "SCALARS %s float 1\n", varname);
fprintf(fp, "LOOKUP_TABLE default\n");
- typeIntern = G3d_tileTypeMap(map);
+ typeIntern = Rast3d_tileTypeMap(map);
percentage = 0;
@@ -398,9 +398,9 @@
cols = region.cols;
depths = region.depths;
- typeIntern[0] = G3d_tileTypeMap(map_r);
- typeIntern[1] = G3d_tileTypeMap(map_g);
- typeIntern[2] = G3d_tileTypeMap(map_b);
+ typeIntern[0] = Rast3d_tileTypeMap(map_r);
+ typeIntern[1] = Rast3d_tileTypeMap(map_g);
+ typeIntern[2] = Rast3d_tileTypeMap(map_b);
percentage = 0;
@@ -473,9 +473,9 @@
cols = region.cols;
depths = region.depths;
- typeIntern[0] = G3d_tileTypeMap(map_x);
- typeIntern[1] = G3d_tileTypeMap(map_y);
- typeIntern[2] = G3d_tileTypeMap(map_z);
+ typeIntern[0] = Rast3d_tileTypeMap(map_x);
+ typeIntern[1] = Rast3d_tileTypeMap(map_y);
+ typeIntern[2] = Rast3d_tileTypeMap(map_z);
percentage = 0;
Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.retile/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -50,8 +50,8 @@
/* Close files and exit */
if (map != NULL) {
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Unable to close the 3d raster map"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Unable to close the 3d raster map"));
}
if (fd != NULL) {
@@ -59,7 +59,7 @@
Rast_unopen(fd[i]);
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
exit(EXIT_FAILURE);
}
@@ -115,29 +115,29 @@
mapset = G_find_grid3(param.input->answer, "");
if (mapset == NULL)
- G3d_fatalError(_("3d raster map <%s> not found"),
+ Rast3d_fatalError(_("3d raster map <%s> not found"),
param.input->answer);
/*Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
if(!param.cache->answer)
- map = G3d_openCellOld(param.input->answer, mapset, RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(param.input->answer, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
else
- map = G3d_openCellOld(param.input->answer, mapset, RASTER3D_DEFAULT_WINDOW,
+ map = Rast3d_openCellOld(param.input->answer, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_NO_CACHE);
if (map == NULL)
- G3d_fatalError(_("Unable to open 3d raster map <%s>"),
+ Rast3d_fatalError(_("Unable to open 3d raster map <%s>"),
param.input->answer);
/* Get the tile dimension */
- G3d_getTileDimension(&tileX, &tileY, &tileZ);
+ Rast3d_getTileDimension(&tileX, &tileY, &tileZ);
if (strcmp(param.tiling->answer, "default") != 0) {
if (sscanf(param.tiling->answer, "%dx%dx%d",
&tileX, &tileY, &tileZ) != 3) {
- G3d_fatalError(_("G3d_getStandard3dParams: tile dimension value invalid"));
+ Rast3d_fatalError(_("Rast3d_getStandard3dParams: tile dimension value invalid"));
}
}
@@ -146,10 +146,10 @@
else
G_message("Retile map without tile caching");
- G3d_retile(map, param.output->answer, tileX, tileY, tileZ);
+ Rast3d_retile(map, param.output->answer, tileX, tileY, tileZ);
/* Close files and exit */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
map = NULL;
Modified: grass/trunk/raster3d/r3.showdspf/main_ogl.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/main_ogl.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.showdspf/main_ogl.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -163,7 +163,7 @@
/* opens grid3 file to read in original data
*/
- G3d_setErrorFun(G3d_printError);
+ Rast3d_setErrorFun(Rast3d_printError);
/* open g3 file for reading */
if (NULL == (mapset = G_find_file2("grid3", g3->answer, ""))) {
@@ -171,7 +171,7 @@
G_fatal_error(buff);
}
- g3map = G3d_openCellOld(g3->answer, mapset, RASTER3D_DEFAULT_WINDOW,
+ g3map = Rast3d_openCellOld(g3->answer, mapset, RASTER3D_DEFAULT_WINDOW,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (NULL == g3map) {
@@ -179,12 +179,12 @@
G_fatal_error(buff);
}
- if (0 == G3d_range_load(g3map)) {
+ if (0 == Rast3d_range_load(g3map)) {
sprintf(buff, "Error reading range for [%s]", g3->answer);
G_fatal_error(buff);
}
- G3d_range_min_max(g3map, &dmin, &dmax);
- G3d_getRegionStructMap(g3map, &g3reg);
+ Rast3d_range_min_max(g3map, &dmin, &dmax);
+ Rast3d_getRegionStructMap(g3map, &g3reg);
viz_make_header(&G3header, dmin, dmax, &g3reg);
init_caps(&D_Cap, &g3reg);
Modified: grass/trunk/raster3d/r3.showdspf/r3_data.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_data.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.showdspf/r3_data.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -10,7 +10,7 @@
int n_lev;
{
- G3d_getBlock(g3map, 0, 0, n_lev,
+ Rast3d_getBlock(g3map, 0, 0, n_lev,
Headfax->xdim, Headfax->ydim, 1, (char *)data, FCELL_TYPE);
return 0;
Modified: grass/trunk/raster3d/r3.stats/main.c
===================================================================
--- grass/trunk/raster3d/r3.stats/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.stats/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -591,10 +591,10 @@
/*Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/*get the current region */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
cols = region.cols;
rows = region.rows;
@@ -609,16 +609,16 @@
infile = inputfile->answer;
if (NULL == G_find_grid3(infile, ""))
- G3d_fatalError(_("Requested g3d map <%s> not found"), infile);
+ Rast3d_fatalError(_("Requested g3d map <%s> not found"), infile);
map =
- G3d_openCellOld(infile, G_find_grid3(infile, ""), ®ion,
+ Rast3d_openCellOld(infile, G_find_grid3(infile, ""), ®ion,
RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening g3d map <%s>"), infile);
+ Rast3d_fatalError(_("Error opening g3d map <%s>"), infile);
- map_type = G3d_tileTypeMap(map);
+ map_type = Rast3d_tileTypeMap(map);
/* calculate statistics for groups of equal values */
if ((equal->answer)) {
@@ -631,8 +631,8 @@
for (y = 0; y < rows; y++) {
for (x = 0; x < cols; x++) {
if (map_type == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_f, map_type);
- if (!G3d_isNullValueNum(&val_f, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_f, map_type);
+ if (!Rast3d_isNullValueNum(&val_f, map_type)) {
/*the first entry */
if (eqvals == NULL)
eqvals =
@@ -645,8 +645,8 @@
}
}
else if (map_type == DCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_d, map_type);
- if (!G3d_isNullValueNum(&val_d, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_d, map_type);
+ if (!Rast3d_isNullValueNum(&val_d, map_type)) {
/*the first entry */
if (eqvals == NULL)
eqvals =
@@ -679,8 +679,8 @@
/*create the statistic table based on value ranges */
/* get the range of the map */
- G3d_range_load(map);
- G3d_range_min_max(map, &min, &max);
+ Rast3d_range_load(map);
+ Rast3d_range_min_max(map, &min, &max);
stats = create_stat_table(nsteps, NULL, min, max);
@@ -690,15 +690,15 @@
for (y = 0; y < rows; y++) {
for (x = 0; x < cols; x++) {
if (map_type == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_f, map_type);
- if (!G3d_isNullValueNum(&val_f, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_f, map_type);
+ if (!Rast3d_isNullValueNum(&val_f, map_type)) {
check_range_value(stats, (double)val_f);
n++;
}
}
else if (map_type == DCELL_TYPE) {
- G3d_getValue(map, x, y, z, &val_d, map_type);
- if (!G3d_isNullValueNum(&val_d, map_type)) {
+ Rast3d_getValue(map, x, y, z, &val_d, map_type);
+ if (!Rast3d_isNullValueNum(&val_d, map_type)) {
check_range_value(stats, val_d);
n++;
}
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -51,8 +51,8 @@
/* Close files and exit */
if (map != NULL) {
- if (!G3d_closeCell(map))
- G3d_fatalError(_("Unable to close the 3d raster map"));
+ if (!Rast3d_closeCell(map))
+ Rast3d_fatalError(_("Unable to close the 3d raster map"));
}
if (fd != NULL) {
@@ -60,7 +60,7 @@
Rast_unopen(fd[i]);
}
- G3d_fatalError(errorMsg);
+ Rast3d_fatalError(errorMsg);
exit(EXIT_FAILURE);
}
@@ -118,7 +118,7 @@
G_debug(2, "g3d_to_raster: Writing %i raster maps with %i rows %i cols.",
depths, rows, cols);
- typeIntern = G3d_tileTypeMap(map);
+ typeIntern = Rast3d_tileTypeMap(map);
if (typeIntern == FCELL_TYPE)
fcell = Rast_allocate_f_buf();
@@ -134,14 +134,14 @@
for (x = 0; x < cols; x++) {
if (typeIntern == FCELL_TYPE) {
- G3d_getValue(map, x, y, z, &f1, typeIntern);
- if (G3d_isNullValueNum(&f1, FCELL_TYPE))
+ Rast3d_getValue(map, x, y, z, &f1, typeIntern);
+ if (Rast3d_isNullValueNum(&f1, FCELL_TYPE))
Rast_set_null_value(&fcell[x], 1, FCELL_TYPE);
else
fcell[x] = f1;
} else {
- G3d_getValue(map, x, y, z, &d1, typeIntern);
- if (G3d_isNullValueNum(&d1, DCELL_TYPE))
+ Rast3d_getValue(map, x, y, z, &d1, typeIntern);
+ if (Rast3d_isNullValueNum(&d1, DCELL_TYPE))
Rast_set_null_value(&dcell[x], 1, DCELL_TYPE);
else
dcell[x] = d1;
@@ -218,46 +218,46 @@
G_debug(3, _("Open 3d raster map <%s>"), param.input->answer);
if (NULL == G_find_grid3(param.input->answer, ""))
- G3d_fatalError(_("3d raster map <%s> not found"),
+ Rast3d_fatalError(_("3d raster map <%s> not found"),
param.input->answer);
/*Set the defaults */
- G3d_initDefaults();
+ Rast3d_initDefaults();
/*Set the resolution of the output maps */
if (param.res->answer) {
/*Open the map with current region */
- map = G3d_openCellOld(param.input->answer,
+ map = Rast3d_openCellOld(param.input->answer,
G_find_grid3(param.input->answer, ""),
RASTER3D_DEFAULT_WINDOW, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening 3d raster map <%s>"),
+ Rast3d_fatalError(_("Error opening 3d raster map <%s>"),
param.input->answer);
/*Get the region of the map */
- G3d_getRegionStructMap(map, ®ion);
+ Rast3d_getRegionStructMap(map, ®ion);
/*set this region as current 3d window for map */
- G3d_setWindowMap(map, ®ion);
+ Rast3d_setWindowMap(map, ®ion);
/*Set the 2d region appropriate */
- G3d_extract2dRegion(®ion, ®ion2d);
+ Rast3d_extract2dRegion(®ion, ®ion2d);
/*Make the new 2d region the default */
Rast_set_window(®ion2d);
} else {
/* Figure out the region from the map */
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
/*Open the 3d raster map */
- map = G3d_openCellOld(param.input->answer,
+ map = Rast3d_openCellOld(param.input->answer,
G_find_grid3(param.input->answer, ""),
®ion, RASTER3D_TILE_SAME_AS_FILE,
RASTER3D_USE_CACHE_DEFAULT);
if (map == NULL)
- G3d_fatalError(_("Error opening 3d raster map <%s>"),
+ Rast3d_fatalError(_("Error opening 3d raster map <%s>"),
param.input->answer);
}
@@ -275,16 +275,16 @@
region.rows = region2d.rows;
region.cols = region2d.cols;
- G3d_adjustRegion(®ion);
+ Rast3d_adjustRegion(®ion);
- G3d_setWindowMap(map, ®ion);
+ Rast3d_setWindowMap(map, ®ion);
}
/* save the input map region for later use (history meta-data) */
- G3d_getRegionStructMap(map, &inputmap_bounds);
+ Rast3d_getRegionStructMap(map, &inputmap_bounds);
/*Get the output type */
- output_type = G3d_fileTypeMap(map);
+ output_type = Rast3d_fileTypeMap(map);
/*prepare the filehandler */
@@ -316,10 +316,10 @@
/*if requested set the Mask on */
if (param.mask->answer) {
- if (G3d_maskFileExists()) {
+ if (Rast3d_maskFileExists()) {
changemask = 0;
- if (G3d_maskIsOff(map)) {
- G3d_maskOn(map);
+ if (Rast3d_maskIsOff(map)) {
+ Rast3d_maskOn(map);
changemask = 1;
}
}
@@ -364,9 +364,9 @@
/*We set the Mask off, if it was off before */
if (param.mask->answer) {
- if (G3d_maskFileExists())
- if (G3d_maskIsOn(map) && changemask)
- G3d_maskOff(map);
+ if (Rast3d_maskFileExists())
+ if (Rast3d_maskIsOn(map) && changemask)
+ Rast3d_maskOff(map);
}
@@ -378,7 +378,7 @@
G_free(fd);
/* Close files and exit */
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
fatal_error(map, NULL, 0, _("Error closing 3d raster map"));
map = NULL;
Modified: grass/trunk/vector/v.to.rast3/main.c
===================================================================
--- grass/trunk/vector/v.to.rast3/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/vector/v.to.rast3/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -64,9 +64,9 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- G3d_initDefaults();
+ Rast3d_initDefaults();
- G3d_getWindow(®ion);
+ Rast3d_getWindow(®ion);
Vect_set_open_level(2);
Vect_open_old2(&Map, in_opt->answer, "", field_opt->answer);
@@ -97,7 +97,7 @@
db_close_database_shutdown_driver(Driver);
- map = G3d_openNewOptTileSize(out_opt->answer,
+ map = Rast3d_openNewOptTileSize(out_opt->answer,
RASTER3D_USE_CACHE_DEFAULT, ®ion, FCELL_TYPE, 32);
if (map == NULL)
@@ -122,11 +122,11 @@
continue;
}
/* Check if the coordinates are located in the cube */
- if (!G3d_isValidLocation(&(map->region), Points->y[0], Points->x[0], Points->z[0])) {
+ if (!Rast3d_isValidLocation(&(map->region), Points->y[0], Points->x[0], Points->z[0])) {
continue;
}
/* Convert the north, east and top coorindate into row, col and depth*/
- G3d_location2coord2(&(map->region), Points->y[0], Points->x[0], Points->z[0], &col, &row, &depth);
+ Rast3d_location2coord2(&(map->region), Points->y[0], Points->x[0], Points->z[0], &col, &row, &depth);
if (ctype == DB_C_TYPE_INT) {
int ivalue;
@@ -145,12 +145,12 @@
G_debug(3, "col,row,depth,val: %d %d %d %f", col, row, depth, value);
- G3d_putFloat(map, col, row, depth, (float)value);
+ Rast3d_putFloat(map, col, row, depth, (float)value);
}
Vect_close(&Map);
- if (!G3d_closeCell(map))
+ if (!Rast3d_closeCell(map))
G_fatal_error(_("Unable to close new 3d raster map"));
exit(EXIT_SUCCESS);
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/vector/v.vol.rst/main.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -449,8 +449,8 @@
G_get_set_window(&cellhd);
- G3d_getWindow(¤t_region);
- G3d_readWindow(¤t_region, NULL);
+ Rast3d_getWindow(¤t_region);
+ Rast3d_readWindow(¤t_region, NULL);
ew_res = current_region.ew_res;
ns_res = current_region.ns_res;
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2011-08-10 17:20:14 UTC (rev 47536)
+++ grass/trunk/vector/v.vol.rst/user1.c 2011-08-10 17:27:10 UTC (rev 47537)
@@ -423,7 +423,7 @@
/*** Write elevation results ***/
if (outz != NULL) {
- cf1 = G3d_openNewOptTileSize(outz, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf1 = Rast3d_openNewOptTileSize(outz, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf1 == NULL) {
sprintf(buff, "Can't open %s for writing ", outz);
clean_fatal_error(buff);
@@ -449,8 +449,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf1, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf1, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -464,7 +464,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf1) == 0) {
+ if (Rast3d_closeCell(cf1) == 0) {
sprintf(buff, "Error closing output file %s ", outz);
clean_fatal_error(buff);
}
@@ -473,7 +473,7 @@
/*** Write out the gradient results ***/
if (gradient != NULL) {
- cf2 = G3d_openNewOptTileSize(gradient, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf2 = Rast3d_openNewOptTileSize(gradient, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf2 == NULL) {
sprintf(buff, "Can't open %s for writing ", gradient);
clean_fatal_error(buff);
@@ -499,8 +499,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf2, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf2, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -514,7 +514,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf2) == 0) {
+ if (Rast3d_closeCell(cf2) == 0) {
sprintf(buff, "Error closing output file %s ", gradient);
clean_fatal_error(buff);
}
@@ -523,7 +523,7 @@
/*** Write out aspect1 results ***/
if (aspect1 != NULL) {
- cf3 = G3d_openNewOptTileSize(aspect1, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf3 = Rast3d_openNewOptTileSize(aspect1, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf3 == NULL) {
sprintf(buff, "Can't open %s for writing ", aspect1);
clean_fatal_error(buff);
@@ -549,8 +549,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf3, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf3, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -564,7 +564,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf3) == 0) {
+ if (Rast3d_closeCell(cf3) == 0) {
sprintf(buff, "Error closing output file %s ", aspect1);
clean_fatal_error(buff);
}
@@ -573,7 +573,7 @@
/*** Write out aspect2 results ***/
if (aspect2 != NULL) {
- cf4 = G3d_openNewOptTileSize(aspect2, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf4 = Rast3d_openNewOptTileSize(aspect2, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf4 == NULL) {
sprintf(buff, "Can't open %s for writing ", aspect2);
clean_fatal_error(buff);
@@ -599,8 +599,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf4, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf4, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -614,7 +614,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf4) == 0) {
+ if (Rast3d_closeCell(cf4) == 0) {
sprintf(buff, "Error closing output file %s ", aspect2);
clean_fatal_error(buff);
}
@@ -623,7 +623,7 @@
/*** Write out ncurv results ***/
if (ncurv != NULL) {
- cf5 = G3d_openNewOptTileSize(ncurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf5 = Rast3d_openNewOptTileSize(ncurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf5 == NULL) {
sprintf(buff, "Can't open %s for writing ", ncurv);
clean_fatal_error(buff);
@@ -649,8 +649,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf5, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf5, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -664,7 +664,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf5) == 0) {
+ if (Rast3d_closeCell(cf5) == 0) {
sprintf(buff, "Error closing output file %s ", ncurv);
clean_fatal_error(buff);
}
@@ -673,7 +673,7 @@
/*** Write out gcurv results ***/
if (gcurv != NULL) {
- cf6 = G3d_openNewOptTileSize(gcurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf6 = Rast3d_openNewOptTileSize(gcurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf6 == NULL) {
sprintf(buff, "Can't open %s for writing ", gcurv);
clean_fatal_error(buff);
@@ -699,8 +699,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf6, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf6, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -714,7 +714,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf6) == 0) {
+ if (Rast3d_closeCell(cf6) == 0) {
sprintf(buff, "Error closing output file %s ", gcurv);
clean_fatal_error(buff);
}
@@ -723,7 +723,7 @@
/*** Write mcurv results ***/
if (mcurv != NULL) {
- cf7 = G3d_openNewOptTileSize(mcurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
+ cf7 = Rast3d_openNewOptTileSize(mcurv, RASTER3D_USE_CACHE_DEFAULT, ¤t_region, FCELL_TYPE, 32);
if (cf7 == NULL) {
sprintf(buff, "Can't open %s for writing ", mcurv);
clean_fatal_error(buff);
@@ -749,8 +749,8 @@
bmask = 1;
value = data[cnt];
if (!bmask)
- G3d_setNullValue(&value, 1, FCELL_TYPE);
- if (G3d_putFloat(cf7, x, y, iarc, value) == 0) {
+ Rast3d_setNullValue(&value, 1, FCELL_TYPE);
+ if (Rast3d_putFloat(cf7, x, y, iarc, value) == 0) {
sprintf(buff,
"Error writing cell (%d,%d,%d) with value %f",
x, y, iarc, value);
@@ -764,7 +764,7 @@
}
/* Close the file */
- if (G3d_closeCell(cf7) == 0) {
+ if (Rast3d_closeCell(cf7) == 0) {
sprintf(buff, "Error closing output file %s ", mcurv);
clean_fatal_error(buff);
}
More information about the grass-commit
mailing list