[GRASS-SVN] r38009 - in grass/trunk: display/d.rast.arrow
display/d.rast.num display/d.zoom general/g.region
general/g.setproj general/manage/lister imagery/i.albedo
imagery/i.atcorr imagery/i.cca imagery/i.class
imagery/i.cluster imagery/i.eb.eta imagery/i.eb.evapfr
imagery/i.eb.h_SEBAL01 imagery/i.eb.soilheatflux
imagery/i.emissivity imagery/i.evapo.time_integration
imagery/i.fft imagery/i.gensig imagery/i.gensigset
imagery/i.his.rgb imagery/i.ifft imagery/i.latlong
imagery/i.maxlik imagery/i.modis.qc imagery/i.pca
imagery/i.points imagery/i.rectify imagery/i.rgb.his
imagery/i.smap imagery/i.sunhours imagery/i.vi
imagery/i.vpoints imagery/i.zc lib/display lib/g3d lib/gpde
lib/nviz lib/ogsf lib/raster lib/rst/interp_float lib/stats
ps/ps.map raster/r.basins.fill raster/r.bitpattern
raster/r.buffer raster/r.carve raster/r.category
raster/r.circle raster/r.clump raster/r.coin raster/r.colors
raster/r.colors.out raster/r.composite raster/r.compress
raster/r.contour raster/r.cost raster/r.covar raster/r.cross
raster/r.describe raster/r.distance raster/r.drain
raster/r.external raster/r.fill.dir raster/r.flow
raster/r.grow.distance raster/r.his raster/r.horizon
raster/r.in.arc raster/r.in.ascii raster/r.in.bin
raster/r.in.gdal raster/r.in.gridatb raster/r.in.mat
raster/r.in.poly raster/r.in.xyz raster/r.info raster/r.kappa
raster/r.lake raster/r.le/r.le.setup/polytocell
raster/r.li/r.li.cwed raster/r.li/r.li.dominance
raster/r.li/r.li.edgedensity raster/r.li/r.li.mpa
raster/r.li/r.li.mps raster/r.li/r.li.padcv
raster/r.li/r.li.padrange raster/r.li/r.li.padsd
raster/r.li/r.li.patchdensity raster/r.li/r.li.patchnum
raster/r.li/r.li.richness raster/r.li/r.li.shannon
raster/r.li/r.li.shape raster/r.li/r.li.simpson raster/r.los
raster/r.mapcalc raster/r.mfilter raster/r.mode
raster/r.neighbors raster/r.null raster/r.out.arc
raster/r.out.ascii raster/r.out.bin raster/r.out.gdal
raster/r.out.gridatb raster/r.out.mat raster/r.out.mpeg
raster/r.out.png raster/r.out.pov raster/r.out.ppm
raster/r.out.ppm3 raster/r.out.tiff raster/r.out.vrml
raster/r.out.vtk raster/r.param.scale raster/r.patch
raster/r.profile raster/r.proj raster/r.quant
raster/r.quantile raster/r.random raster/r.random.cells
raster/r.random.surface raster/r.reclass raster/r.recode
raster/r.region raster/r.report raster/r.resamp.interp
raster/r.resamp.rst raster/r.resamp.stats raster/r.resample
raster/r.rescale raster/r.rescale.eq raster/r.ros
raster/r.slope.aspect raster/r.spread raster/r.spreadpath
raster/r.statistics raster/r.statistics2 raster/r.statistics3
raster/r.stats raster/r.sun raster/r.sun2 raster/r.sunmask
raster/r.support raster/r.support.stats raster/r.surf.area
raster/r.surf.contour raster/r.surf.fractal
raster/r.surf.gauss raster/r.surf.idw raster/r.surf.idw2
raster/r.surf.random raster/r.terraflow raster/r.texture
raster/r.thin raster/r.to.rast3 raster/r.to.rast3elev
raster/r.to.vect raster/r.topidx raster/r.topmodel
raster/r.uslek raster/r.usler raster/r.volume raster/r.walk
raster/r.water.outlet raster/r.watershed/front
raster/r.watershed/ram raster/r.watershed/seg raster/r.what
raster/r.what.color raster/simwe/simlib
raster3d/r3.cross.rast raster3d/r3.out.vtk
raster3d/r3.to.rast swig/perl/R_slope_aspect/r_slope_aspect
vector/lidar/lidarlib vector/lidar/v.lidar.correction
vector/lidar/v.lidar.edgedetection
vector/lidar/v.lidar.growing vector/lidar/v.outlier
vector/lidar/v.surf.bspline vector/v.convert vector/v.drape
vector/v.extrude vector/v.kernel vector/v.neighbors
vector/v.sample vector/v.surf.idw vector/v.to.rast
vector/v.what.rast visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Jun 21 08:59:17 EDT 2009
Author: martinl
Date: 2009-06-21 08:59:15 -0400 (Sun, 21 Jun 2009)
New Revision: 38009
Modified:
grass/trunk/display/d.rast.arrow/main.c
grass/trunk/display/d.rast.num/main.c
grass/trunk/display/d.zoom/set.c
grass/trunk/general/g.region/adjust.c
grass/trunk/general/g.region/main.c
grass/trunk/general/g.region/zoom.c
grass/trunk/general/g.setproj/main.c
grass/trunk/general/manage/lister/Makefile
grass/trunk/imagery/i.albedo/Makefile
grass/trunk/imagery/i.atcorr/Makefile
grass/trunk/imagery/i.atcorr/main.cpp
grass/trunk/imagery/i.cca/Makefile
grass/trunk/imagery/i.class/analyze_sig.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/signature.c
grass/trunk/imagery/i.cluster/Makefile
grass/trunk/imagery/i.eb.eta/Makefile
grass/trunk/imagery/i.eb.evapfr/Makefile
grass/trunk/imagery/i.eb.h_SEBAL01/Makefile
grass/trunk/imagery/i.eb.soilheatflux/Makefile
grass/trunk/imagery/i.emissivity/Makefile
grass/trunk/imagery/i.evapo.time_integration/Makefile
grass/trunk/imagery/i.fft/Makefile
grass/trunk/imagery/i.gensig/Makefile
grass/trunk/imagery/i.gensigset/Makefile
grass/trunk/imagery/i.his.rgb/Makefile
grass/trunk/imagery/i.ifft/Makefile
grass/trunk/imagery/i.ifft/main.c
grass/trunk/imagery/i.latlong/Makefile
grass/trunk/imagery/i.maxlik/Makefile
grass/trunk/imagery/i.modis.qc/Makefile
grass/trunk/imagery/i.pca/Makefile
grass/trunk/imagery/i.points/drawcell.c
grass/trunk/imagery/i.rectify/Makefile
grass/trunk/imagery/i.rectify/rectify.c
grass/trunk/imagery/i.rectify/write.c
grass/trunk/imagery/i.rgb.his/Makefile
grass/trunk/imagery/i.smap/Makefile
grass/trunk/imagery/i.sunhours/Makefile
grass/trunk/imagery/i.vi/Makefile
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.vpoints/setup.c
grass/trunk/imagery/i.zc/Makefile
grass/trunk/lib/display/Makefile
grass/trunk/lib/display/setup.c
grass/trunk/lib/g3d/Makefile
grass/trunk/lib/g3d/g3dregion.c
grass/trunk/lib/gpde/Makefile
grass/trunk/lib/gpde/N_geom.c
grass/trunk/lib/gpde/N_pde.h
grass/trunk/lib/nviz/Makefile
grass/trunk/lib/ogsf/Makefile
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/set_window.c
grass/trunk/lib/rst/interp_float/Makefile
grass/trunk/lib/rst/interp_float/output2d.c
grass/trunk/lib/rst/interp_float/resout2d.c
grass/trunk/lib/stats/Makefile
grass/trunk/ps/ps.map/Makefile
grass/trunk/ps/ps.map/main.c
grass/trunk/raster/r.basins.fill/Makefile
grass/trunk/raster/r.basins.fill/main.c
grass/trunk/raster/r.bitpattern/Makefile
grass/trunk/raster/r.buffer/Makefile
grass/trunk/raster/r.carve/Makefile
grass/trunk/raster/r.category/Makefile
grass/trunk/raster/r.category/cats.c
grass/trunk/raster/r.circle/Makefile
grass/trunk/raster/r.clump/Makefile
grass/trunk/raster/r.coin/Makefile
grass/trunk/raster/r.coin/main.c
grass/trunk/raster/r.colors.out/Makefile
grass/trunk/raster/r.colors/Makefile
grass/trunk/raster/r.composite/Makefile
grass/trunk/raster/r.compress/Makefile
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.contour/Makefile
grass/trunk/raster/r.cost/Makefile
grass/trunk/raster/r.covar/Makefile
grass/trunk/raster/r.cross/Makefile
grass/trunk/raster/r.describe/Makefile
grass/trunk/raster/r.describe/describe.c
grass/trunk/raster/r.distance/Makefile
grass/trunk/raster/r.drain/Makefile
grass/trunk/raster/r.external/Makefile
grass/trunk/raster/r.external/main.c
grass/trunk/raster/r.fill.dir/Makefile
grass/trunk/raster/r.flow/Makefile
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.grow.distance/Makefile
grass/trunk/raster/r.his/Makefile
grass/trunk/raster/r.horizon/Makefile
grass/trunk/raster/r.horizon/main.c
grass/trunk/raster/r.in.arc/Makefile
grass/trunk/raster/r.in.arc/gethead.c
grass/trunk/raster/r.in.arc/main.c
grass/trunk/raster/r.in.ascii/Makefile
grass/trunk/raster/r.in.ascii/gethead.c
grass/trunk/raster/r.in.ascii/main.c
grass/trunk/raster/r.in.bin/Makefile
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.in.gdal/Makefile
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.gridatb/Makefile
grass/trunk/raster/r.in.gridatb/adjcellhd.c
grass/trunk/raster/r.in.mat/Makefile
grass/trunk/raster/r.in.mat/main.c
grass/trunk/raster/r.in.poly/Makefile
grass/trunk/raster/r.in.poly/raster.c
grass/trunk/raster/r.in.xyz/Makefile
grass/trunk/raster/r.info/Makefile
grass/trunk/raster/r.kappa/Makefile
grass/trunk/raster/r.lake/Makefile
grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
grass/trunk/raster/r.li/r.li.cwed/Makefile
grass/trunk/raster/r.li/r.li.dominance/Makefile
grass/trunk/raster/r.li/r.li.edgedensity/Makefile
grass/trunk/raster/r.li/r.li.mpa/Makefile
grass/trunk/raster/r.li/r.li.mps/Makefile
grass/trunk/raster/r.li/r.li.padcv/Makefile
grass/trunk/raster/r.li/r.li.padrange/Makefile
grass/trunk/raster/r.li/r.li.padsd/Makefile
grass/trunk/raster/r.li/r.li.patchdensity/Makefile
grass/trunk/raster/r.li/r.li.patchnum/Makefile
grass/trunk/raster/r.li/r.li.richness/Makefile
grass/trunk/raster/r.li/r.li.shannon/Makefile
grass/trunk/raster/r.li/r.li.shape/Makefile
grass/trunk/raster/r.li/r.li.simpson/Makefile
grass/trunk/raster/r.los/Makefile
grass/trunk/raster/r.mapcalc/Makefile
grass/trunk/raster/r.mfilter/Makefile
grass/trunk/raster/r.mode/Makefile
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.null/Makefile
grass/trunk/raster/r.null/main.c
grass/trunk/raster/r.out.arc/Makefile
grass/trunk/raster/r.out.ascii/Makefile
grass/trunk/raster/r.out.bin/Makefile
grass/trunk/raster/r.out.gdal/Makefile
grass/trunk/raster/r.out.gridatb/Makefile
grass/trunk/raster/r.out.gridatb/adjcellhd.c
grass/trunk/raster/r.out.mat/Makefile
grass/trunk/raster/r.out.mpeg/Makefile
grass/trunk/raster/r.out.png/Makefile
grass/trunk/raster/r.out.pov/Makefile
grass/trunk/raster/r.out.ppm/Makefile
grass/trunk/raster/r.out.ppm3/Makefile
grass/trunk/raster/r.out.tiff/Makefile
grass/trunk/raster/r.out.tiff/main.c
grass/trunk/raster/r.out.vrml/Makefile
grass/trunk/raster/r.out.vtk/Makefile
grass/trunk/raster/r.param.scale/Makefile
grass/trunk/raster/r.patch/Makefile
grass/trunk/raster/r.profile/Makefile
grass/trunk/raster/r.proj/Makefile
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.quant/Makefile
grass/trunk/raster/r.quantile/Makefile
grass/trunk/raster/r.random.cells/Makefile
grass/trunk/raster/r.random.surface/Makefile
grass/trunk/raster/r.random/Makefile
grass/trunk/raster/r.reclass/Makefile
grass/trunk/raster/r.recode/Makefile
grass/trunk/raster/r.recode/recode.c
grass/trunk/raster/r.region/Makefile
grass/trunk/raster/r.region/main.c
grass/trunk/raster/r.report/Makefile
grass/trunk/raster/r.resamp.interp/Makefile
grass/trunk/raster/r.resamp.interp/main.c
grass/trunk/raster/r.resamp.rst/main.c
grass/trunk/raster/r.resamp.stats/main.c
grass/trunk/raster/r.resample/Makefile
grass/trunk/raster/r.rescale.eq/Makefile
grass/trunk/raster/r.rescale/Makefile
grass/trunk/raster/r.rescale/get_range.c
grass/trunk/raster/r.ros/Makefile
grass/trunk/raster/r.slope.aspect/Makefile
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.spread/Makefile
grass/trunk/raster/r.spreadpath/Makefile
grass/trunk/raster/r.statistics/Makefile
grass/trunk/raster/r.statistics2/Makefile
grass/trunk/raster/r.statistics3/Makefile
grass/trunk/raster/r.stats/Makefile
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.sun2/Makefile
grass/trunk/raster/r.sun2/main.c
grass/trunk/raster/r.sunmask/Makefile
grass/trunk/raster/r.support.stats/Makefile
grass/trunk/raster/r.support.stats/histo.c
grass/trunk/raster/r.support/Makefile
grass/trunk/raster/r.support/histo.c
grass/trunk/raster/r.surf.area/Makefile
grass/trunk/raster/r.surf.contour/Makefile
grass/trunk/raster/r.surf.fractal/Makefile
grass/trunk/raster/r.surf.gauss/Makefile
grass/trunk/raster/r.surf.idw/Makefile
grass/trunk/raster/r.surf.idw2/Makefile
grass/trunk/raster/r.surf.idw2/read_cell.c
grass/trunk/raster/r.surf.random/Makefile
grass/trunk/raster/r.terraflow/Makefile
grass/trunk/raster/r.texture/Makefile
grass/trunk/raster/r.thin/Makefile
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/Makefile
grass/trunk/raster/r.topidx/Makefile
grass/trunk/raster/r.topmodel/Makefile
grass/trunk/raster/r.uslek/Makefile
grass/trunk/raster/r.usler/Makefile
grass/trunk/raster/r.volume/Makefile
grass/trunk/raster/r.walk/Makefile
grass/trunk/raster/r.water.outlet/Makefile
grass/trunk/raster/r.watershed/front/Makefile
grass/trunk/raster/r.watershed/ram/Makefile
grass/trunk/raster/r.watershed/seg/Makefile
grass/trunk/raster/r.what.color/Makefile
grass/trunk/raster/r.what/Makefile
grass/trunk/raster/simwe/simlib/output.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/lidar/lidarlib/zones.c
grass/trunk/vector/lidar/v.lidar.correction/Makefile
grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile
grass/trunk/vector/lidar/v.lidar.growing/Makefile
grass/trunk/vector/lidar/v.lidar.growing/main.c
grass/trunk/vector/lidar/v.outlier/Makefile
grass/trunk/vector/lidar/v.surf.bspline/Makefile
grass/trunk/vector/v.convert/Makefile
grass/trunk/vector/v.drape/Makefile
grass/trunk/vector/v.extrude/Makefile
grass/trunk/vector/v.kernel/Makefile
grass/trunk/vector/v.neighbors/Makefile
grass/trunk/vector/v.sample/Makefile
grass/trunk/vector/v.surf.idw/Makefile
grass/trunk/vector/v.to.rast/Makefile
grass/trunk/vector/v.to.rast/raster.c
grass/trunk/vector/v.what.rast/Makefile
grass/trunk/visualization/xganim/Makefile
Log:
fix compilation - add $(RASTRLIB/DEP) + various minor fixes (gis/raster lib)
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -244,7 +244,7 @@
wind.rows = (wind.north - wind.south) / wind.ns_res;
wind.cols = (wind.east - wind.west) / wind.ew_res;
- G_set_window(&wind);
+ Rast_set_window(&wind);
nrows = wind.rows;
ncols = wind.cols;
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -154,7 +154,7 @@
wind.rows = (wind.north - wind.south) / wind.ns_res;
wind.cols = (wind.east - wind.west) / wind.ew_res;
- G_set_window(&wind);
+ Rast_set_window(&wind);
nrows = wind.rows;
ncols = wind.cols;
Modified: grass/trunk/display/d.zoom/set.c
===================================================================
--- grass/trunk/display/d.zoom/set.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/display/d.zoom/set.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -176,9 +176,9 @@
limit = print_limit(window, &defwin);
- Rast_adjust_Cell_head3(window, 0, 0, 0);
+ G_adjust_Cell_head3(window, 0, 0, 0);
G_put_window(window);
- G_set_window(window);
+ Rast_set_window(window);
redraw();
}
Modified: grass/trunk/general/g.region/adjust.c
===================================================================
--- grass/trunk/general/g.region/adjust.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/general/g.region/adjust.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -5,7 +5,7 @@
void adjust_window(struct Cell_head *window, int row_flag, int col_flag, int depth_flag)
{
- const char *err = Rast_adjust_Cell_head3(window, row_flag, col_flag, depth_flag);
+ const char *err = G_adjust_Cell_head3(window, row_flag, col_flag, depth_flag);
if (err)
G_fatal_error(_("Invalid region: %s"), err);
Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/general/g.region/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -460,7 +460,7 @@
window.west : temp_window.west;
}
}
- Rast_adjust_Cell_head3(&window, 0, 0, 0);
+ G_adjust_Cell_head3(&window, 0, 0, 0);
}
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/general/g.region/zoom.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -15,7 +15,7 @@
double north, south, east, west;
adjust_window(window, 0, 0, 0);
- G_set_window(window);
+ Rast_set_window(window);
nrows = window->rows;
ncols = window->cols;
Modified: grass/trunk/general/g.setproj/main.c
===================================================================
--- grass/trunk/general/g.setproj/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/general/g.setproj/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -100,7 +100,7 @@
G_fatal_error(_("PERMANENT: permission denied"));
}
G_get_default_window(&cellhd);
- if (-1 == G_set_window(&cellhd))
+ if (-1 == Rast_set_window(&cellhd))
G_fatal_error(_("Current region cannot be set"));
if (G_get_set_window(&cellhd) == -1)
Modified: grass/trunk/general/manage/lister/Makefile
===================================================================
--- grass/trunk/general/manage/lister/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/general/manage/lister/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../../..
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/imagery/i.albedo/Makefile
===================================================================
--- grass/trunk/imagery/i.albedo/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.albedo/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.albedo
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.atcorr/Makefile
===================================================================
--- grass/trunk/imagery/i.atcorr/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.atcorr/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,8 +4,8 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
LINK = $(CXX)
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-06-21 12:59:15 UTC (rev 38009)
@@ -100,7 +100,7 @@
G_fatal_error (_("Unable to read header of raster map <%s>"),
G_fully_qualified_name(name, mapset));
- if(G_set_window(&iimg_head) < 0)
+ if(Rast_set_window(&iimg_head) < 0)
G_fatal_error (_("Invalid graphics region coordinates"));
}
Modified: grass/trunk/imagery/i.cca/Makefile
===================================================================
--- grass/trunk/imagery/i.cca/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.cca/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.cca
-LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP)
+LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.class/analyze_sig.c
===================================================================
--- grass/trunk/imagery/i.class/analyze_sig.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.class/analyze_sig.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -16,7 +16,7 @@
Menu_msg("");
/* allocate row buffers and open raster maps */
- G_set_window(&Band_cellhd);
+ Rast_set_window(&Band_cellhd);
nbands = Refer.nfiles;
open_band_files();
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -24,7 +24,7 @@
if (overlay == OVER_WRITE)
display_title(view);
- G_set_window(&view->cell.head);
+ Rast_set_window(&view->cell.head);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/imagery/i.class/signature.c
===================================================================
--- grass/trunk/imagery/i.class/signature.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.class/signature.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -269,7 +269,7 @@
nbands = Refer.nfiles;
/* build new mask based on current signature and Nstd */
- G_set_window(&VIEW_MAP1->cell.head);
+ Rast_set_window(&VIEW_MAP1->cell.head);
open_band_files();
if ((fd = Rast_open_cell_new(MASK)) < 0)
Modified: grass/trunk/imagery/i.cluster/Makefile
===================================================================
--- grass/trunk/imagery/i.cluster/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.cluster/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.cluster
-LIBES = $(CLUSTERLIB) $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(CLUSTERDEP) $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(CLUSTERLIB) $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(CLUSTERDEP) $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.eb.eta/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.eta/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.eb.eta/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.eb.eta
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.eb.evapfr/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.eb.evapfr/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.eb.evapfr
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.eb.h_SEBAL01
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.eb.soilheatflux/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.eb.soilheatflux/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.eb.soilheatflux
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.emissivity/Makefile
===================================================================
--- grass/trunk/imagery/i.emissivity/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.emissivity/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.emissivity
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.evapo.time_integration/Makefile
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.evapo.time_integration/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.evapo.time_integration
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.fft/Makefile
===================================================================
--- grass/trunk/imagery/i.fft/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.fft/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.fft
-LIBES = $(GMATHLIB) $(GISLIB) $(FFTWLIB) $(MATHLIB)
-DEPENDENCIES= $(GMATHDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB) $(MATHLIB)
+DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.gensig/Makefile
===================================================================
--- grass/trunk/imagery/i.gensig/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.gensig/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.gensig
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.gensigset/Makefile
===================================================================
--- grass/trunk/imagery/i.gensigset/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.gensigset/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.gensigset
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.his.rgb/Makefile
===================================================================
--- grass/trunk/imagery/i.his.rgb/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.his.rgb/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.his.rgb
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.ifft/Makefile
===================================================================
--- grass/trunk/imagery/i.ifft/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.ifft/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.ifft
-LIBES = $(GMATHLIB) $(GISLIB) $(FFTWLIB) $(MATHLIB)
-DEPENDENCIES= $(GMATHDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB) $(MATHLIB)
+DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -124,7 +124,7 @@
realhead.ns_res != imaghead.ns_res)
G_fatal_error(_("The real and imaginary original windows did not match"));
- G_set_window(&realhead); /* set the window to the whole cell map */
+ Rast_set_window(&realhead); /* set the window to the whole cell map */
/* get the rows and columns in the current window */
rows = G_window_rows();
Modified: grass/trunk/imagery/i.latlong/Makefile
===================================================================
--- grass/trunk/imagery/i.latlong/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.latlong/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.latlong
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.maxlik/Makefile
===================================================================
--- grass/trunk/imagery/i.maxlik/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.maxlik/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.maxlik
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.modis.qc/Makefile
===================================================================
--- grass/trunk/imagery/i.modis.qc/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.modis.qc/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.modis.qc
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.pca/Makefile
===================================================================
--- grass/trunk/imagery/i.pca/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.pca/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.pca
-LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP)
+LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -37,7 +37,7 @@
set_colors(colors);
- G_set_window(&view->cell.head);
+ Rast_set_window(&view->cell.head);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/imagery/i.rectify/Makefile
===================================================================
--- grass/trunk/imagery/i.rectify/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.rectify/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.rectify
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.rectify/rectify.c
===================================================================
--- grass/trunk/imagery/i.rectify/rectify.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.rectify/rectify.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -34,14 +34,14 @@
*/
select_target_env();
- G_set_window(&target_window);
+ Rast_set_window(&target_window);
Rast_set_cell_format(cellhd.format);
select_current_env();
/* open the file to be rectified
* set window to cellhd first to be able to read file exactly
*/
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
infd = Rast_open_cell_old(name, mapset);
if (infd < 0) {
close(infd);
Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.rectify/write.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -41,7 +41,7 @@
int fd, row;
void *rast;
- G_set_window(&target_window);
+ Rast_set_window(&target_window);
rast = Rast_allocate_raster_buf(map_type);
close(temp_fd);
Modified: grass/trunk/imagery/i.rgb.his/Makefile
===================================================================
--- grass/trunk/imagery/i.rgb.his/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.rgb.his/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.rgb.his
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.smap/Makefile
===================================================================
--- grass/trunk/imagery/i.smap/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.smap/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.smap
-LIBES = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.sunhours/Makefile
===================================================================
--- grass/trunk/imagery/i.sunhours/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.sunhours/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.sunhours
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.vi/Makefile
===================================================================
--- grass/trunk/imagery/i.vi/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.vi/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.vi
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -47,7 +47,7 @@
Erase_view(VIEW_MAP2_ZOOM);
}
- G_set_window(&view->cell.head);
+ Rast_set_window(&view->cell.head);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/imagery/i.vpoints/setup.c
===================================================================
--- grass/trunk/imagery/i.vpoints/setup.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.vpoints/setup.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -55,7 +55,7 @@
D_check_map_window(cellhead);
- if (G_set_window(cellhead) < 0)
+ if (Rast_set_window(cellhead) < 0)
G_fatal_error("Invalid graphics window coordinates");
/* Determine conversion factors */
Modified: grass/trunk/imagery/i.zc/Makefile
===================================================================
--- grass/trunk/imagery/i.zc/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/imagery/i.zc/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = i.zc
-LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(FFTWLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(GISDEP)
+LIBES = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/lib/display/Makefile
===================================================================
--- grass/trunk/lib/display/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/display/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1,6 +1,7 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB)
+EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) \
+ $(HTMLDRIVERLIB) $(RASTRLIB)
EXTRA_INC = -I../driver
ifneq ($(USE_CAIRO),)
Modified: grass/trunk/lib/display/setup.c
===================================================================
--- grass/trunk/lib/display/setup.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/display/setup.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -11,6 +11,7 @@
*/
#include <string.h>
#include <grass/gis.h>
+#include <grass/Rast.h>
#include <grass/display.h>
#include <grass/display_raster.h>
@@ -43,7 +44,7 @@
R_get_window(&dt, &db, &dl, &dr);
G_get_set_window(®ion);
- if (G_set_window(®ion) < 0)
+ if (Rast_set_window(®ion) < 0)
G_fatal_error("Invalid graphics coordinates");
D_do_conversions(®ion, dt, db, dl, dr);
Modified: grass/trunk/lib/g3d/Makefile
===================================================================
--- grass/trunk/lib/g3d/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/g3d/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,7 +2,7 @@
LIB_NAME = $(G3D_LIBNAME)
-EXTRA_LIBS = $(GISLIB)
+EXTRA_LIBS = $(GISLIB) $(RASTRLIB)
include $(MODULE_TOPDIR)/include/Make/Lib.make
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
Modified: grass/trunk/lib/g3d/g3dregion.c
===================================================================
--- grass/trunk/lib/g3d/g3dregion.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/g3d/g3dregion.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -155,7 +155,7 @@
const char *err;
G3d_regionToCellHead(region, ®ion2d);
- if ((err = Rast_adjust_Cell_head3(®ion2d, 1, 1, 1)) != NULL) {
+ if ((err = G_adjust_Cell_head3(®ion2d, 1, 1, 1)) != NULL) {
G_fatal_error("G3d_adjustRegion: %s", err);
}
G3d_regionFromToCellHead(®ion2d, region);
@@ -184,7 +184,7 @@
const char *err;
G3d_regionToCellHead(region, ®ion2d);
- if ((err = Rast_adjust_Cell_head3(®ion2d, 1, 1, 1)) != NULL) {
+ if ((err = G_adjust_Cell_head3(®ion2d, 1, 1, 1)) != NULL) {
G_fatal_error("G3d_adjustRegionRes: %s", err);
}
G3d_regionFromToCellHead(®ion2d, region);
Modified: grass/trunk/lib/gpde/Makefile
===================================================================
--- grass/trunk/lib/gpde/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/gpde/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,7 +4,7 @@
#EXTRA_CFLAGS=-fopenmp
#EXTRA_LIBS=$(GISLIB) $(G3DLIB) -lgomp $(MATHLIB)
-EXTRA_LIBS=$(GISLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(RASTRLIB)
LIB_NAME = $(GPDE_LIBNAME)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/gpde/N_geom.c
===================================================================
--- grass/trunk/lib/gpde/N_geom.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/gpde/N_geom.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -130,7 +130,7 @@
/*make a backup from this region */
G_get_set_window(&backup); /*this function is not thread safe */
/*set the current region */
- G_set_window(region); /*this function is not thread safe */
+ Rast_set_window(region); /*this function is not thread safe */
if (geom == NULL)
geom = N_alloc_geom_data();
@@ -170,7 +170,7 @@
}
/*restore the old region */
- G_set_window(&backup); /*this function is not thread safe */
+ Rast_set_window(&backup); /*this function is not thread safe */
}
return geom;
Modified: grass/trunk/lib/gpde/N_pde.h
===================================================================
--- grass/trunk/lib/gpde/N_pde.h 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/gpde/N_pde.h 2009-06-21 12:59:15 UTC (rev 38009)
@@ -16,6 +16,7 @@
*****************************************************************************/
#include <grass/gis.h>
+#include <grass/Rast.h>
#include <grass/G3d.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/nviz/Makefile
===================================================================
--- grass/trunk/lib/nviz/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/nviz/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,7 +2,9 @@
LIB_NAME = $(NVIZ_LIBNAME)
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) \
+ $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
+ $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTRLIB)
include $(MODULE_TOPDIR)/include/Make/Lib.make
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
Modified: grass/trunk/lib/ogsf/Makefile
===================================================================
--- grass/trunk/lib/ogsf/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/ogsf/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1,6 +1,8 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) \
+ $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
+ $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(RASTRLIB)
LIB_NAME = $(OGSF_LIBNAME)
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/raster/opencell.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -368,7 +368,7 @@
Diagnostics: warning message printed if open fails
- Warning: calls to G_set_window() made after opening a new cell file
+ Warning: calls to Rast_set_window() made after opening a new cell file
may create confusion and should be avoided the new cell file will be
created to conform to the window at the time of the open.
Modified: grass/trunk/lib/raster/set_window.c
===================================================================
--- grass/trunk/lib/raster/set_window.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/raster/set_window.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -40,7 +40,7 @@
*/
if ((err = G_adjust_Cell_head(window, 0, 0))) {
- G_warning("G_set_window(): %s", err);
+ G_warning("Rast_set_window(): %s", err);
return -1;
}
@@ -55,7 +55,7 @@
fcb->cellhd.proj == window->proj)
continue;
if (i != maskfd) {
- G_warning(_("G_set_window(): projection/zone differs from that of "
+ G_warning(_("Rast_set_window(): projection/zone differs from that of "
"currently open raster maps"));
return -1;
}
@@ -112,7 +112,7 @@
fcb->min_null_row = (-1) * NULL_ROWS_INMEM;
if(fcb->null_cur_row > 0)
{
- G_warning(_("Calling G_set_window() in the middle of writing map %s"),
+ G_warning(_("Calling Rast_set_window() in the middle of writing map %s"),
fcb->name);
fcb->null_cur_row = 0;
}
Modified: grass/trunk/lib/rst/interp_float/Makefile
===================================================================
--- grass/trunk/lib/rst/interp_float/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/rst/interp_float/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1,10 +1,11 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB)
+EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) \
+ $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(RASTRLIB)
LIB_NAME = $(INTERPFL_LIBNAME)
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/rst/interp_float/output2d.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -128,7 +128,7 @@
return -1;
}
- if (G_set_window(cellhd) < 0)
+ if (Rast_set_window(cellhd) < 0)
return -1;
if (nrows != G_window_rows()) {
Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -58,7 +58,7 @@
/* change region to output cell file region */
fprintf(stderr,
"Temporarily changing the region to desired resolution...\n");
- if (G_set_window(outhd) < 0) {
+ if (Rast_set_window(outhd) < 0) {
fprintf(stderr, "Cannot set region to output region!\n");
return -1;
}
@@ -538,7 +538,7 @@
/* change region to initial region */
fprintf(stderr, "Changing the region back to initial...\n");
- if (G_set_window(winhd) < 0) {
+ if (Rast_set_window(winhd) < 0) {
fprintf(stderr, "Cannot set region to back to initial region!\n");
return -1;
}
Modified: grass/trunk/lib/stats/Makefile
===================================================================
--- grass/trunk/lib/stats/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/lib/stats/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1,7 +1,6 @@
-
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
+EXTRA_LIBS=$(GISLIB) $(RASTRLIB)
LIB_NAME = $(STATS_LIBNAME)
Modified: grass/trunk/ps/ps.map/Makefile
===================================================================
--- grass/trunk/ps/ps.map/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/ps/ps.map/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM=ps.map
PROLOG=$(ETC)/paint/prolog.ps
-LIBES = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
-DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
+DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
EXTRA_INC = $(VECT_INC) $(PROJINC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/ps/ps.map/main.c
===================================================================
--- grass/trunk/ps/ps.map/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/ps/ps.map/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -285,7 +285,7 @@
/* set current window */
G_get_set_window(&PS.w);
- if (G_set_window(&PS.w) == -1)
+ if (Rast_set_window(&PS.w) == -1)
G_fatal_error(_("Current region cannot be set."));
while (1) {
Modified: grass/trunk/raster/r.basins.fill/Makefile
===================================================================
--- grass/trunk/raster/r.basins.fill/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.basins.fill/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.basins.fill
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.basins.fill/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -28,9 +28,9 @@
#include <stdio.h>
#include <grass/gis.h>
#include <grass/Rast.h>
-#include "local_proto.h"
#include <grass/glocale.h>
+#include "local_proto.h"
#define NOMASK 1
@@ -92,7 +92,7 @@
/* this isn't a nice thing to do. Rast_align_window() should be used first */
Rast_get_cellhd(drain_name, "", &window);
- G_set_window(&window);
+ Rast_set_window(&window);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.bitpattern/Makefile
===================================================================
--- grass/trunk/raster/r.bitpattern/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.bitpattern/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.bitpattern
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.buffer/Makefile
===================================================================
--- grass/trunk/raster/r.buffer/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.buffer/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.buffer2
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.carve/Makefile
===================================================================
--- grass/trunk/raster/r.carve/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.carve/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.carve
-LIBES = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.category/Makefile
===================================================================
--- grass/trunk/raster/r.category/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.category/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.category
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.category/cats.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -36,7 +36,7 @@
G_fatal_error(_("Cannot read header of raster map <%s> in <%s>"),
name, mapset);
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
/* open the raster map */
fd = Rast_open_cell_old(name, mapset);
Modified: grass/trunk/raster/r.circle/Makefile
===================================================================
--- grass/trunk/raster/r.circle/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.circle/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.circle
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.clump/Makefile
===================================================================
--- grass/trunk/raster/r.clump/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.clump/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.clump
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.coin/Makefile
===================================================================
--- grass/trunk/raster/r.coin/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.coin/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.coin
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.coin/main.c
===================================================================
--- grass/trunk/raster/r.coin/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.coin/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -104,15 +104,15 @@
/* now make a temorary region with the same boundaries only 1 x 1 */
window.rows = 1;
window.cols = 1;
- Rast_adjust_Cell_head(&window, 1, 1);
- G_set_window(&window);
+ G_adjust_Cell_head(&window, 1, 1);
+ Rast_set_window(&window);
G_begin_cell_area_calculations();
window_area = G_area_of_cell_at_row(0);
/* restore region back to the original */
G_get_window(&window);
- G_set_window(&window);
+ Rast_set_window(&window);
dumpname = G_tempfile();
statname = G_tempfile();
Modified: grass/trunk/raster/r.colors/Makefile
===================================================================
--- grass/trunk/raster/r.colors/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.colors/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.colors
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.colors.out/Makefile
===================================================================
--- grass/trunk/raster/r.colors.out/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.colors.out/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.colors.out
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.composite/Makefile
===================================================================
--- grass/trunk/raster/r.composite/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.composite/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.composite
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.compress/Makefile
===================================================================
--- grass/trunk/raster/r.compress/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.compress/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.compress
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.compress/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -189,7 +189,7 @@
G_message(_("\n%sCOMPRESS [%s]"), uncompress ? "UN" : "", name);
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
old = Rast_open_cell_old(name, G_mapset());
if (old < 0)
Modified: grass/trunk/raster/r.contour/Makefile
===================================================================
--- grass/trunk/raster/r.contour/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.contour/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM=r.contour
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.cost/Makefile
===================================================================
--- grass/trunk/raster/r.cost/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.cost/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.cost
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.covar/Makefile
===================================================================
--- grass/trunk/raster/r.covar/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.covar/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.covar
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.cross/Makefile
===================================================================
--- grass/trunk/raster/r.cross/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.cross/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.cross
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.describe/Makefile
===================================================================
--- grass/trunk/raster/r.describe/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.describe/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.describe
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.describe/describe.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -46,7 +46,7 @@
if (Rast_get_cellhd(name, "", &window) < 0)
G_fatal_error(_("Unable to get cell header for <%s>"), name);
- G_set_window(&window);
+ Rast_set_window(&window);
get_row = Rast_get_c_raster_row_nomask;
}
fd = Rast_open_cell_old(name, "");
Modified: grass/trunk/raster/r.distance/Makefile
===================================================================
--- grass/trunk/raster/r.distance/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.distance/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.distance
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.drain/Makefile
===================================================================
--- grass/trunk/raster/r.drain/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.drain/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.drain
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.external/Makefile
===================================================================
--- grass/trunk/raster/r.external/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.external/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.external
-LIBES= $(GPROJLIB) $(GISLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP) $(GMATHDEP)
EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.external/main.c
===================================================================
--- grass/trunk/raster/r.external/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.external/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -647,7 +647,7 @@
if (!hBand)
G_fatal_error(_("Selected band (%d) does not exist"), band);
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
G_fatal_error(_("Unable to set window"));
query_band(hBand, output, flag_r->answer, &cellhd, &info);
Modified: grass/trunk/raster/r.fill.dir/Makefile
===================================================================
--- grass/trunk/raster/r.fill.dir/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.fill.dir/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.fill.dir
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.flow/Makefile
===================================================================
--- grass/trunk/raster/r.flow/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.flow/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM=r.flow
-LIBES = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.flow/io.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -193,7 +193,7 @@
double dsmax = 0.0;
struct Colors colors;
- if (G_set_window(®ion) < 0)
+ if (Rast_set_window(®ion) < 0)
G_fatal_error(_("Cannot reset current region"));
G_message(_("Writing density file"));
Modified: grass/trunk/raster/r.grow.distance/Makefile
===================================================================
--- grass/trunk/raster/r.grow.distance/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.grow.distance/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.grow.distance
-LIBES = $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(MATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.his/Makefile
===================================================================
--- grass/trunk/raster/r.his/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.his/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.his
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.horizon/Makefile
===================================================================
--- grass/trunk/raster/r.horizon/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.horizon/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.horizon
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -471,7 +471,7 @@
n100 = ceil(n / 100.);
m100 = ceil(m / 100.);
- if (G_set_window(&new_cellhd) == -1)
+ if (Rast_set_window(&new_cellhd) == -1)
exit(EXIT_FAILURE);
}
@@ -512,7 +512,7 @@
if (bufferZone > 0.) {
/* Set the region window back to the original */
- if (G_set_window(&cellhd) == -1)
+ if (Rast_set_window(&cellhd) == -1)
exit(EXIT_FAILURE);
}
@@ -522,7 +522,7 @@
OUTGR(cellhd.rows,cellhd.cols);
}
*/
- if (G_set_window(&cellhd) == -1)
+ if (Rast_set_window(&cellhd) == -1)
exit(EXIT_FAILURE);
exit(EXIT_SUCCESS);
@@ -613,7 +613,7 @@
int fd1 = 0;
int i, iarc, j;
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
exit(EXIT_FAILURE);
if (horizon != NULL) {
@@ -1261,7 +1261,7 @@
/*return back the buffered region */
if (bufferZone > 0.) {
- if (G_set_window(&new_cellhd) == -1)
+ if (Rast_set_window(&new_cellhd) == -1)
exit(0);
}
Modified: grass/trunk/raster/r.in.arc/Makefile
===================================================================
--- grass/trunk/raster/r.in.arc/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.arc/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.arc
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.arc/gethead.c
===================================================================
--- grass/trunk/raster/r.in.arc/gethead.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.arc/gethead.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -98,7 +98,7 @@
return 0;
}
- if (err = Rast_adjust_Cell_head(cellhd, 1, 1)) {
+ if (err = G_adjust_Cell_head(cellhd, 1, 1)) {
G_warning(err);
return 0;
}
Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -129,7 +129,7 @@
nrows = cellhd.rows;
ncols = cellhd.cols;
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
G_fatal_error(_("Can't set window"));
if (nrows != G_window_rows())
Modified: grass/trunk/raster/r.in.ascii/Makefile
===================================================================
--- grass/trunk/raster/r.in.ascii/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.ascii/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.ascii
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.ascii/gethead.c
===================================================================
--- grass/trunk/raster/r.in.ascii/gethead.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.ascii/gethead.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -221,7 +221,7 @@
}
}
- if ((err = Rast_adjust_Cell_head(cellhd, 1, 1))) {
+ if ((err = G_adjust_Cell_head(cellhd, 1, 1))) {
G_warning(err);
return 0;
}
Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.ascii/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -187,7 +187,7 @@
nrows = cellhd.rows;
ncols = cellhd.cols;
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
G_fatal_error(_("Can't set window"));
if (nrows != G_window_rows())
Modified: grass/trunk/raster/r.in.bin/Makefile
===================================================================
--- grass/trunk/raster/r.in.bin/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.bin/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.bin
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -406,7 +406,7 @@
}
/* Adjust Cell Header to match resolution */
- if (err = Rast_adjust_Cell_head(&cellhd, 0, 0)) {
+ if (err = G_adjust_Cell_head(&cellhd, 0, 0)) {
G_fatal_error("%s", err);
exit(EXIT_FAILURE);
}
@@ -418,7 +418,7 @@
if (!flag.gmt_hd->answer) {
/* Adjust Cell Header to New Values */
- if (err = Rast_adjust_Cell_head(&cellhd, 1, 1)) {
+ if (err = G_adjust_Cell_head(&cellhd, 1, 1)) {
G_fatal_error("%s", err);
exit(EXIT_FAILURE);
}
@@ -426,7 +426,7 @@
grass_ncols = ncols = cellhd.cols;
}
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
exit(3);
if (grass_nrows != G_window_rows())
Modified: grass/trunk/raster/r.in.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.in.gdal/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.gdal/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.gdal
-LIBES= $(GPROJLIB) $(GISLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP) $(GMATHDEP)
EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -434,7 +434,7 @@
/* -------------------------------------------------------------------- */
/* Set the active window to match the available data. */
/* -------------------------------------------------------------------- */
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
exit(EXIT_FAILURE);
/* -------------------------------------------------------------------- */
Modified: grass/trunk/raster/r.in.gridatb/Makefile
===================================================================
--- grass/trunk/raster/r.in.gridatb/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.gridatb/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.gridatb
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.gridatb/adjcellhd.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/adjcellhd.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.gridatb/adjcellhd.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,7 +8,7 @@
retval = 0;
- if (G_set_window(cellhd) < 0) {
+ if (Rast_set_window(cellhd) < 0) {
retval = 1;
}
Modified: grass/trunk/raster/r.in.mat/Makefile
===================================================================
--- grass/trunk/raster/r.in.mat/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.mat/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.mat
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.mat/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -389,10 +389,10 @@
region.proj = G_projection();
region.zone = G_zone();
- err = Rast_adjust_Cell_head(®ion, 1, 1);
+ err = G_adjust_Cell_head(®ion, 1, 1);
if (err)
G_fatal_error(err);
- G_set_window(®ion);
+ Rast_set_window(®ion);
G_verbose_message("");
G_verbose_message(_("Map <%s> bounds set to:"), map_name);
Modified: grass/trunk/raster/r.in.poly/Makefile
===================================================================
--- grass/trunk/raster/r.in.poly/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.poly/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.poly
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.in.poly/raster.c
===================================================================
--- grass/trunk/raster/r.in.poly/raster.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.poly/raster.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -139,7 +139,7 @@
/* change the region */
page.north = region.north - at_row * region.ns_res;
page.south = page.north - nrows * region.ns_res;
- G_set_window(&page);
+ Rast_set_window(&page);
/* configure the plot routines */
G_setup_plot(-0.5, page.rows - 0.5, -0.5, page.cols - 0.5, move, cont);
Modified: grass/trunk/raster/r.in.xyz/Makefile
===================================================================
--- grass/trunk/raster/r.in.xyz/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.in.xyz/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.in.xyz
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.info/Makefile
===================================================================
--- grass/trunk/raster/r.info/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.info/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.info
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.kappa/Makefile
===================================================================
--- grass/trunk/raster/r.kappa/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.kappa/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.kappa
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.lake/Makefile
===================================================================
--- grass/trunk/raster/r.lake/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.lake/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,8 +4,8 @@
PGM = r.lake
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -64,7 +64,7 @@
quit();
}
- G_set_window(&wind);
+ Rast_set_window(&wind);
record = Rast_allocate_cell_buf();
Modified: grass/trunk/raster/r.li/r.li.cwed/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.cwed/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.dominance/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.dominance/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.edgedensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.edgedensity/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.mpa/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.mpa/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.mps/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.mps/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.padcv/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.padcv/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.padrange/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.padrange/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.padsd/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.padsd/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.patchdensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.patchdensity/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.patchnum/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.patchnum/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.richness/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.richness/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.shannon/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.shannon/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.shape/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.shape/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.li/r.li.simpson/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.li/r.li.simpson/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -8,9 +8,9 @@
RLI_LIB = -l$(LIB_NAME)
-LIBES = $(GISLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
-DEPENDENCIES = $(GISDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.los/Makefile
===================================================================
--- grass/trunk/raster/r.los/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.los/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.los
-LIBES = $(SEGMENTLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GPROJDEP) $(GISDEP)
+LIBES = $(SEGMENTLIB) $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.mapcalc/Makefile
===================================================================
--- grass/trunk/raster/r.mapcalc/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.mapcalc/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -12,8 +12,8 @@
include $(MODULE_TOPDIR)/include/Make/Multi.make
EXTRA_CFLAGS = $(READLINEINCPATH) $(PTHREADINCPATH)
-LIBES2 = $(GISLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
-LIBES3 = $(G3DLIB) $(GISLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
+LIBES2 = $(GISLIB) $(RASTRLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
+LIBES3 = $(G3DLIB) $(GISLIB) $(RASTRLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
default: multi
Modified: grass/trunk/raster/r.mfilter/Makefile
===================================================================
--- grass/trunk/raster/r.mfilter/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.mfilter/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.mfilter
-LIBES = $(ROWIOLIB) $(GISLIB)
-DEPENDENCIES = $(ROWIODEP) $(GISDEP)
+LIBES = $(ROWIOLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.mode/Makefile
===================================================================
--- grass/trunk/raster/r.mode/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.mode/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.mode
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -208,7 +208,7 @@
exit(EXIT_FAILURE);
G_get_window(&window);
G_align_window(&window, &cellhd);
- G_set_window(&window);
+ Rast_set_window(&window);
}
nrows = G_window_rows();
Modified: grass/trunk/raster/r.null/Makefile
===================================================================
--- grass/trunk/raster/r.null/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.null/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.null
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.null/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -311,7 +311,7 @@
int new, old, row;
void *rast;
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
old = Rast_open_cell_old(name, mapset);
if (old < 0)
Modified: grass/trunk/raster/r.out.arc/Makefile
===================================================================
--- grass/trunk/raster/r.out.arc/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.arc/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.arc
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.ascii/Makefile
===================================================================
--- grass/trunk/raster/r.out.ascii/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.ascii/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.ascii
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.bin/Makefile
===================================================================
--- grass/trunk/raster/r.out.bin/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.bin/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.bin
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.out.gdal/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.gdal/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.gdal
-LIBES= $(GPROJLIB) $(GISLIB) $(GDALLIBS) $(IMAGERYLIB) $(DBMIBASELIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(IMAGERYDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(GDALLIBS) $(IMAGERYLIB) $(DBMIBASELIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP)
EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.gridatb/Makefile
===================================================================
--- grass/trunk/raster/r.out.gridatb/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.gridatb/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.gridatb
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.gridatb/adjcellhd.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/adjcellhd.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.gridatb/adjcellhd.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -5,7 +5,7 @@
{
int retval = 0;
- if (G_set_window(cellhd) < 0)
+ if (Rast_set_window(cellhd) < 0)
retval = 1;
if (cellhd->rows != G_window_rows())
Modified: grass/trunk/raster/r.out.mat/Makefile
===================================================================
--- grass/trunk/raster/r.out.mat/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.mat/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.mat
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.mpeg/Makefile
===================================================================
--- grass/trunk/raster/r.out.mpeg/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.mpeg/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.mpeg
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.png/Makefile
===================================================================
--- grass/trunk/raster/r.out.png/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.png/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM = r.out.png
EXTRA_CFLAGS=$(PNGINC)
-LIBES = $(GISLIB) $(PNGLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(PNGLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.pov/Makefile
===================================================================
--- grass/trunk/raster/r.out.pov/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.pov/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.pov
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.ppm/Makefile
===================================================================
--- grass/trunk/raster/r.out.ppm/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.ppm/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.ppm
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.ppm3/Makefile
===================================================================
--- grass/trunk/raster/r.out.ppm3/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.ppm3/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.ppm3
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.tiff/Makefile
===================================================================
--- grass/trunk/raster/r.out.tiff/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.tiff/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -6,8 +6,8 @@
EXTRA_CFLAGS = $(TIFFINCPATH)
-LIBES = $(GISLIB) $(TIFFLIBPATH) $(TIFFLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(TIFFLIBPATH) $(TIFFLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
ifneq ($(strip $(TIFFLIB)),)
default: cmd
Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.tiff/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -26,7 +26,7 @@
*
* removed LZW support 5/5000
*
- * Corrected G_set_window to G_get_window to make r.out.tiff sensitive
+ * Corrected Rast_set_window to G_get_window to make r.out.tiff sensitive
* to region settings. - Markus Neteler (neteler geog.uni-hannover.de
* 8/98
*
Modified: grass/trunk/raster/r.out.vrml/Makefile
===================================================================
--- grass/trunk/raster/r.out.vrml/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.vrml/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.vrml
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.out.vtk/Makefile
===================================================================
--- grass/trunk/raster/r.out.vtk/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.out.vtk/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.out.vtk
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.param.scale/Makefile
===================================================================
--- grass/trunk/raster/r.param.scale/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.param.scale/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.param.scale
-LIBES = $(GISLIB) $(GMATHLIB)
-DEPENDENCIES = $(GISDEP) $(GMATHDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(GMATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.patch/Makefile
===================================================================
--- grass/trunk/raster/r.patch/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.patch/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.patch
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.profile/Makefile
===================================================================
--- grass/trunk/raster/r.profile/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.profile/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.profile
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.proj/Makefile
===================================================================
--- grass/trunk/raster/r.proj/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.proj/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.proj
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.proj/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -286,7 +286,7 @@
/* this call causes r.proj to read the entire map into memeory */
Rast_get_cellhd(inmap->answer, setname, &incellhd);
- G_set_window(&incellhd);
+ Rast_set_window(&incellhd);
if (G_projection() == PROJECTION_XY)
G_fatal_error(_("Unable to work with unprojected data (xy location)"));
@@ -325,7 +325,7 @@
if (incellhd.west < iwest)
incellhd.west = iwest;
- G_set_window(&incellhd);
+ Rast_set_window(&incellhd);
/* And switch back to original location */
@@ -359,8 +359,8 @@
if (res->answer != NULL) /* set user defined resolution */
outcellhd.ns_res = outcellhd.ew_res = atof(res->answer);
- Rast_adjust_Cell_head(&outcellhd, 0, 0);
- G_set_window(&outcellhd);
+ G_adjust_Cell_head(&outcellhd, 0, 0);
+ Rast_set_window(&outcellhd);
G_message("");
G_message(_("Input:"));
@@ -387,14 +387,14 @@
/* open and read the relevant parts of the input map and close it */
G__switch_env();
- G_set_window(&incellhd);
+ Rast_set_window(&incellhd);
fdi = Rast_open_cell_old(inmap->answer, setname);
cell_type = Rast_get_raster_map_type(fdi);
ibuffer = readcell(fdi, memory->answer);
Rast_close_cell(fdi);
G__switch_env();
- G_set_window(&outcellhd);
+ Rast_set_window(&outcellhd);
if (strcmp(interpol->answer, "nearest") == 0) {
fdo = Rast_open_raster_new(mapname, cell_type);
Modified: grass/trunk/raster/r.quant/Makefile
===================================================================
--- grass/trunk/raster/r.quant/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.quant/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.quant
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.quantile/Makefile
===================================================================
--- grass/trunk/raster/r.quantile/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.quantile/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.quantile
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.random/Makefile
===================================================================
--- grass/trunk/raster/r.random/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.random/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.random
-LIBES = $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.random.cells/Makefile
===================================================================
--- grass/trunk/raster/r.random.cells/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.random.cells/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.random.cells
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.random.surface/Makefile
===================================================================
--- grass/trunk/raster/r.random.surface/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.random.surface/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.random.surface
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.reclass/Makefile
===================================================================
--- grass/trunk/raster/r.reclass/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.reclass/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.reclass
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.recode/Makefile
===================================================================
--- grass/trunk/raster/r.recode/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.recode/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.recode
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -30,7 +30,7 @@
G_get_window(&window);
if (Rast_get_cellhd(name, "", &cellhd) >= 0) {
G_align_window(&window, &cellhd);
- G_set_window(&window);
+ Rast_set_window(&window);
}
}
Modified: grass/trunk/raster/r.region/Makefile
===================================================================
--- grass/trunk/raster/r.region/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.region/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.region
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.region/main.c
===================================================================
--- grass/trunk/raster/r.region/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.region/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -320,7 +320,7 @@
window.rows = cellhd.rows;
window.cols = cellhd.cols;
- if ((err = Rast_adjust_Cell_head(&window, 1, 1)))
+ if ((err = G_adjust_Cell_head(&window, 1, 1)))
G_fatal_error(_("Invalid region: %s"), err);
cellhd.north = window.north;
Modified: grass/trunk/raster/r.report/Makefile
===================================================================
--- grass/trunk/raster/r.report/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.report/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.report
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.resamp.interp/Makefile
===================================================================
--- grass/trunk/raster/r.resamp.interp/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.resamp.interp/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.resamp.interp
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -120,7 +120,7 @@
src_w.cols = c1 - c0;
}
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
/* allocate buffers for input rows */
for (row = 0; row < neighbors; row++)
@@ -134,7 +134,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), rastin->answer);
/* reset window to current region */
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
outbuf = Rast_allocate_d_raster_buf();
@@ -155,7 +155,7 @@
G_percent(row, dst_w.rows, 2);
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
read_rows(infile, maprow0);
for (col = 0; col < dst_w.cols; col++) {
@@ -173,7 +173,7 @@
}
}
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
Rast_put_d_raster_row(outfile, outbuf);
}
break;
@@ -187,7 +187,7 @@
G_percent(row, dst_w.rows, 2);
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
read_rows(infile, maprow0);
for (col = 0; col < dst_w.cols; col++) {
@@ -212,7 +212,7 @@
}
}
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
Rast_put_d_raster_row(outfile, outbuf);
}
break;
@@ -227,7 +227,7 @@
G_percent(row, dst_w.rows, 2);
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
read_rows(infile, maprow0);
for (col = 0; col < dst_w.cols; col++) {
@@ -285,7 +285,7 @@
}
}
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
Rast_put_d_raster_row(outfile, outbuf);
}
break;
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.resamp.rst/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -345,7 +345,7 @@
outhd.south = winhd.south;
outhd.proj = winhd.proj;
outhd.zone = winhd.zone;
- Rast_adjust_Cell_head(&outhd, 0, 0);
+ G_adjust_Cell_head(&outhd, 0, 0);
ew_res = outhd.ew_res;
ns_res = outhd.ns_res;
nsizc = outhd.cols;
@@ -473,13 +473,13 @@
IL_secpar_loop_2d, IL_crst, IL_crstg, IL_write_temp_2d);
G_message(_("Temporarily changing the region to desired resolution ..."));
- if (G_set_window(&outhd) < 0)
+ if (Rast_set_window(&outhd) < 0)
G_fatal_error(_("Cannot set region to output region"));
bitmask = IL_create_bitmask(¶ms);
/* change region to initial region */
G_message(_("Changing back to the original region ..."));
- if (G_set_window(&winhd) < 0)
+ if (Rast_set_window(&winhd) < 0)
G_fatal_error(_("Cannot set region to back to the initial region"));
ertot = 0.;
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -117,7 +117,7 @@
G_percent(row, dst_w.rows, 2);
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
for (i = 0; i < count; i++)
Rast_get_d_raster_row(infile, bufs[i], maprow0 + i);
@@ -148,7 +148,7 @@
(*method_fn) (&outbuf[col], values, n, closure);
}
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
Rast_put_d_raster_row(outfile, outbuf);
}
}
@@ -190,7 +190,7 @@
G_percent(row, dst_w.rows, 2);
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
for (i = 0; i < count; i++)
Rast_get_d_raster_row(infile, bufs[i], maprow0 + i);
@@ -234,7 +234,7 @@
(*method_fn) (&outbuf[col], values, n, closure);
}
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
Rast_put_d_raster_row(outfile, outbuf);
}
}
@@ -325,7 +325,7 @@
src_w.cols = c1 - c0;
}
- G_set_window(&src_w);
+ Rast_set_window(&src_w);
row_scale = 2 + ceil(dst_w.ns_res / src_w.ns_res);
col_scale = 2 + ceil(dst_w.ew_res / src_w.ew_res);
@@ -342,7 +342,7 @@
parm.rastin->answer);
/* reset window to current region */
- G_set_window(&dst_w);
+ Rast_set_window(&dst_w);
/* allocate output buffer */
outbuf = Rast_allocate_d_raster_buf();
Modified: grass/trunk/raster/r.resample/Makefile
===================================================================
--- grass/trunk/raster/r.resample/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.resample/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.resample
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.rescale/Makefile
===================================================================
--- grass/trunk/raster/r.rescale/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.rescale/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.rescale
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.rescale/get_range.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -16,7 +16,7 @@
if (Rast_read_range(name, "", &range) < 0) {
Rast_init_range(&range); /* read the file to get the range */
Rast_get_cellhd(name, "", &cellhd);
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
cell = Rast_allocate_cell_buf();
fd = Rast_open_cell_old(name, "");
if (fd < 0)
Modified: grass/trunk/raster/r.rescale.eq/Makefile
===================================================================
--- grass/trunk/raster/r.rescale.eq/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.rescale.eq/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.rescale.eq
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.ros/Makefile
===================================================================
--- grass/trunk/raster/r.ros/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.ros/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.ros
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.slope.aspect/Makefile
===================================================================
--- grass/trunk/raster/r.slope.aspect/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.slope.aspect/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.slope.aspect
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -367,7 +367,7 @@
G_get_window(&window);
if (Rast_get_cellhd(elev_name, "", &cellhd) >= 0) {
G_align_window(&window, &cellhd);
- G_set_window(&window);
+ Rast_set_window(&window);
}
}
Modified: grass/trunk/raster/r.spread/Makefile
===================================================================
--- grass/trunk/raster/r.spread/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.spread/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -6,10 +6,10 @@
MOD_OBJS := $(filter-out display.o,$(AUTO_OBJS))
-# LIBES = $(DISPLAYLIB) $(GISLIB)
-# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+# LIBES = $(DISPLAYLIB) $(GISLIB) $(RASTRLIB)
+# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.spreadpath/Makefile
===================================================================
--- grass/trunk/raster/r.spreadpath/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.spreadpath/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.spreadpath
-LIBES = $(SEGMENTLIB) $(GISLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GISDEP)
+LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.statistics/Makefile
===================================================================
--- grass/trunk/raster/r.statistics/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.statistics/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.statistics
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.statistics2/Makefile
===================================================================
--- grass/trunk/raster/r.statistics2/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.statistics2/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.statistics2
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.statistics3/Makefile
===================================================================
--- grass/trunk/raster/r.statistics3/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.statistics3/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.statistics3
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.stats/Makefile
===================================================================
--- grass/trunk/raster/r.stats/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.stats/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.stats
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.sun/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -731,7 +731,7 @@
}
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
G_fatal_error("region error");
if (m != G_window_rows())
Modified: grass/trunk/raster/r.sun2/Makefile
===================================================================
--- grass/trunk/raster/r.sun2/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.sun2/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.sun
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -1202,7 +1202,7 @@
}
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
G_fatal_error("Cannot set region to output region!");
if (m != G_window_rows())
Modified: grass/trunk/raster/r.sunmask/Makefile
===================================================================
--- grass/trunk/raster/r.sunmask/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.sunmask/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.sunmask
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.support/Makefile
===================================================================
--- grass/trunk/raster/r.support/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.support/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.support
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.support/histo.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -21,7 +21,7 @@
if (Rast_get_cellhd(name, "", &cellhd) < 0)
G_fatal_error(_("Unable to read header for <%s>"), name);
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
if ((fd = Rast_open_cell_old(name, "")) < 0)
G_fatal_error(_("Unable to open <%s>"), name);
Modified: grass/trunk/raster/r.support.stats/Makefile
===================================================================
--- grass/trunk/raster/r.support.stats/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.support.stats/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.support.stats
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.support.stats/histo.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -37,7 +37,7 @@
if (Rast_get_cellhd(name, "", &cellhd) < 0)
return 1;
- G_set_window(&cellhd);
+ Rast_set_window(&cellhd);
if ((fd = Rast_open_cell_old(name, "")) < 0)
return 1;
Modified: grass/trunk/raster/r.surf.area/Makefile
===================================================================
--- grass/trunk/raster/r.surf.area/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.area/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.area
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.contour/Makefile
===================================================================
--- grass/trunk/raster/r.surf.contour/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.contour/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.contour
-LIBES = $(SEGMENTLIB) $(GISLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GISDEP)
+LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.fractal/Makefile
===================================================================
--- grass/trunk/raster/r.surf.fractal/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.fractal/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.fractal
-LIBES = $(GMATHLIB) $(GISLIB) $(FFTWLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(FFTWINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.gauss/Makefile
===================================================================
--- grass/trunk/raster/r.surf.gauss/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.gauss/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.gauss
-LIBES = $(GMATHLIB) $(GISLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.idw/Makefile
===================================================================
--- grass/trunk/raster/r.surf.idw/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.idw/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.idw
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.idw2/Makefile
===================================================================
--- grass/trunk/raster/r.surf.idw2/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.idw2/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.idw2
-LIBES = $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DATETIMEDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -19,7 +19,7 @@
/* Set window to align with input raster map */
Rast_get_cellhd(name, "", &cellhd);
G_align_window(&window, &cellhd);
- G_set_window(&window);
+ Rast_set_window(&window);
cell = Rast_allocate_cell_buf();
@@ -48,7 +48,7 @@
/* reset the window */
G_get_window(&window);
- G_set_window(&window);
+ Rast_set_window(&window);
return 0;
}
Modified: grass/trunk/raster/r.surf.random/Makefile
===================================================================
--- grass/trunk/raster/r.surf.random/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.surf.random/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.surf.random
-LIBES = $(GMATHLIB) $(GISLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.terraflow/Makefile
===================================================================
--- grass/trunk/raster/r.terraflow/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.terraflow/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.terraflow
-LIBES = $(GISLIB) $(IOSTREAMLIB)
-DEPENDENCIES = $(GISDEP) $(IOSTREAMDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(IOSTREAMLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(IOSTREAMDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.texture/Makefile
===================================================================
--- grass/trunk/raster/r.texture/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.texture/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.texture
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.thin/Makefile
===================================================================
--- grass/trunk/raster/r.thin/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.thin/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.thin
-LIBES = $(ROWIOLIB) $(GISLIB)
-DEPENDENCIES = $(ROWIODEP) $(GISDEP)
+LIBES = $(ROWIOLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.to.rast3/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -225,7 +225,7 @@
window2d.ew_res = region.ew_res;
window2d.rows = region.rows;
window2d.cols = region.cols;
- G_set_window(&window2d);
+ Rast_set_window(&window2d);
}
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -423,7 +423,7 @@
window2d.ew_res = region.ew_res;
window2d.rows = region.rows;
window2d.cols = region.cols;
- G_set_window(&window2d);
+ Rast_set_window(&window2d);
}
G_debug(2, "Open 3d raster map %s", param.output->answer);
Modified: grass/trunk/raster/r.to.vect/Makefile
===================================================================
--- grass/trunk/raster/r.to.vect/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.to.vect/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,8 +4,8 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.topidx/Makefile
===================================================================
--- grass/trunk/raster/r.topidx/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.topidx/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.topidx
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.topmodel/Makefile
===================================================================
--- grass/trunk/raster/r.topmodel/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.topmodel/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.topmodel
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.uslek/Makefile
===================================================================
--- grass/trunk/raster/r.uslek/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.uslek/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.uslek
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.usler/Makefile
===================================================================
--- grass/trunk/raster/r.usler/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.usler/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.usler
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.volume/Makefile
===================================================================
--- grass/trunk/raster/r.volume/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.volume/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,8 +4,8 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(SITESDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(SITESDEP) $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.walk/Makefile
===================================================================
--- grass/trunk/raster/r.walk/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.walk/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.walk
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/raster/r.water.outlet/Makefile
===================================================================
--- grass/trunk/raster/r.water.outlet/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.water.outlet/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.water.outlet
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.watershed/front/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/front/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.watershed/front/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.watershed
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.watershed/ram/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/ram/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.watershed/ram/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.watershed.ram
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
Modified: grass/trunk/raster/r.watershed/seg/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/seg/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.watershed/seg/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.watershed.seg
-LIBES = $(GISLIB) $(SEGMENTLIB)
-DEPENDENCIES = $(GISDEP) $(SEGMENTDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(SEGMENTLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(SEGMENTDEP)
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
Modified: grass/trunk/raster/r.what/Makefile
===================================================================
--- grass/trunk/raster/r.what/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.what/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.what
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.what.color/Makefile
===================================================================
--- grass/trunk/raster/r.what.color/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/r.what.color/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = r.what.color
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/simwe/simlib/output.c
===================================================================
--- grass/trunk/raster/simwe/simlib/output.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster/simwe/simlib/output.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -172,7 +172,7 @@
}
- if (G_set_window(&cellhd) < 0)
+ if (Rast_set_window(&cellhd) < 0)
exit(3);
if (my != G_window_rows())
@@ -647,8 +647,8 @@
}
- if (G_set_window(&cellhd) < 0)
- G_fatal_error("G_set_window");
+ if (Rast_set_window(&cellhd) < 0)
+ G_fatal_error("Rast_set_window");
if (my != G_window_rows())
G_fatal_error("OOPS: rows changed from %d to %d\n", mx,
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -301,7 +301,7 @@
window2d.ew_res = region.ew_res;
window2d.rows = region.rows;
window2d.cols = region.cols;
- G_set_window(&window2d);
+ Rast_set_window(&window2d);
}
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -459,7 +459,7 @@
window2d.ew_res = region.ew_res;
window2d.rows = region.rows;
window2d.cols = region.cols;
- G_set_window(&window2d);
+ Rast_set_window(&window2d);
}
/*open top */
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -252,7 +252,7 @@
/*Set the 2d region appropriate */
G3d_extract2dRegion(®ion, ®ion2d);
/*Make the new 2d region the default */
- G_set_window(®ion2d);
+ Rast_set_window(®ion2d);
}
else {
Modified: grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
===================================================================
--- grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -396,7 +396,7 @@
G_get_window(&window);
if (Rast_get_cellhd(elev_name, mapset, &cellhd) >= 0) {
Rast_align_window(&window, &cellhd);
- G_set_window(&window);
+ Rast_set_window(&window);
}
}
Modified: grass/trunk/vector/lidar/lidarlib/zones.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -270,7 +270,7 @@
struct Cell_head Original;
G_get_window(&Original);
- G_set_window(&Original);
+ Rast_set_window(&Original);
nrows = G_window_rows();
ncols = G_window_cols();
@@ -373,7 +373,7 @@
G_get_window(&Original);
- G_set_window(&Original);
+ Rast_set_window(&Original);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/vector/lidar/v.lidar.correction/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.lidar.correction/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.lidar.correction
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.lidar.edgedetection
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/lidar/v.lidar.growing/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.lidar.growing/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.lidar.growing
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -219,7 +219,7 @@
}
/*Setting the active region */
- G_set_window(&elaboration_reg);
+ Rast_set_window(&elaboration_reg);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/vector/lidar/v.outlier/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.outlier/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.outlier/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.outlier
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/lidar/v.surf.bspline/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/lidar/v.surf.bspline/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.surf.bspline
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.convert/Makefile
===================================================================
--- grass/trunk/vector/v.convert/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.convert/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM=v.convert
-LIBES = $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.drape/Makefile
===================================================================
--- grass/trunk/vector/v.drape/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.drape/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM = v.drape
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.extrude/Makefile
===================================================================
--- grass/trunk/vector/v.extrude/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.extrude/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.extrude
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.kernel/Makefile
===================================================================
--- grass/trunk/vector/v.kernel/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.kernel/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM=v.kernel
-LIBES = $(VECTLIB) $(DBMILIB) $(GMATHLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GMATHDEP) $(GISDEP) $(DATETIMEDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.neighbors/Makefile
===================================================================
--- grass/trunk/vector/v.neighbors/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.neighbors/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.neighbors
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.sample/Makefile
===================================================================
--- grass/trunk/vector/v.sample/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.sample/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.sample
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.surf.idw/Makefile
===================================================================
--- grass/trunk/vector/v.surf.idw/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.surf.idw/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -2,8 +2,8 @@
PGM = v.surf.idw
-LIBES = $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.to.rast/Makefile
===================================================================
--- grass/trunk/vector/v.to.rast/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.to.rast/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM=v.to.rast
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.to.rast/raster.c
===================================================================
--- grass/trunk/vector/v.to.rast/raster.c 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.to.rast/raster.c 2009-06-21 12:59:15 UTC (rev 38009)
@@ -124,7 +124,7 @@
/* change the region */
page.north = region.north - at_row * region.ns_res;
page.south = page.north - nrows * region.ns_res;
- G_set_window(&page);
+ Rast_set_window(&page);
/* configure the plot routines */
G_setup_plot(-0.5, page.rows - 0.5, -0.5, page.cols - 0.5, move, cont);
Modified: grass/trunk/vector/v.what.rast/Makefile
===================================================================
--- grass/trunk/vector/v.what.rast/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/vector/v.what.rast/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -3,8 +3,8 @@
PGM=v.what.rast
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/visualization/xganim/Makefile
===================================================================
--- grass/trunk/visualization/xganim/Makefile 2009-06-21 10:42:22 UTC (rev 38008)
+++ grass/trunk/visualization/xganim/Makefile 2009-06-21 12:59:15 UTC (rev 38009)
@@ -4,8 +4,8 @@
EXTRA_CFLAGS = $(WXWIDGETSCXXFLAGS) -DWXINTL_NO_GETTEXT_MACRO
-LIBES = $(GISLIB) $(WXWIDGETSLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(WXWIDGETSLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
More information about the grass-commit
mailing list