[GRASS-SVN] r37990 - in grass/trunk: display/d.barscale
display/d.colors display/d.colortable display/d.erase
display/d.extract display/d.font display/d.fontlist
display/d.geodesic display/d.graph display/d.grid
display/d.his display/d.histogram display/d.info
display/d.labels display/d.legend display/d.linegraph
display/d.measure display/d.nviz display/d.path
display/d.profile display/d.rast display/d.rast.arrow
display/d.rast.num display/d.rgb display/d.rhumbline
display/d.text display/d.thematic.area display/d.title
display/d.vect display/d.vect.chart display/d.what.rast
display/d.what.vect display/d.where display/d.zoom
imagery/i.class imagery/i.points imagery/i.vpoints include
lib/display raster/r.digit raster/r.his
raster/r.le/r.le.setup raster/r.le/r.le.trace raster/r.spread
vector/v.label vector/v.what
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Jun 20 04:33:36 EDT 2009
Author: martinl
Date: 2009-06-20 04:33:35 -0400 (Sat, 20 Jun 2009)
New Revision: 37990
Added:
grass/trunk/include/display_raster.h
Removed:
grass/trunk/include/raster.h
Modified:
grass/trunk/display/d.barscale/draw_scale.c
grass/trunk/display/d.barscale/main.c
grass/trunk/display/d.colors/get_info.c
grass/trunk/display/d.colors/interact.c
grass/trunk/display/d.colors/main.c
grass/trunk/display/d.colortable/main.c
grass/trunk/display/d.erase/main.c
grass/trunk/display/d.extract/extract.c
grass/trunk/display/d.extract/main.c
grass/trunk/display/d.font/main.c
grass/trunk/display/d.fontlist/main.c
grass/trunk/display/d.geodesic/main.c
grass/trunk/display/d.geodesic/plot.c
grass/trunk/display/d.graph/do_graph.c
grass/trunk/display/d.graph/main.c
grass/trunk/display/d.grid/main.c
grass/trunk/display/d.grid/plot.c
grass/trunk/display/d.his/main.c
grass/trunk/display/d.histogram/bar.c
grass/trunk/display/d.histogram/draw_slice.c
grass/trunk/display/d.histogram/main.c
grass/trunk/display/d.histogram/pie.c
grass/trunk/display/d.info/main.c
grass/trunk/display/d.labels/do_labels.c
grass/trunk/display/d.labels/main.c
grass/trunk/display/d.legend/main.c
grass/trunk/display/d.linegraph/main.c
grass/trunk/display/d.measure/draw_line.c
grass/trunk/display/d.measure/main.c
grass/trunk/display/d.measure/msurements.c
grass/trunk/display/d.nviz/main.c
grass/trunk/display/d.path/main.c
grass/trunk/display/d.path/select.c
grass/trunk/display/d.profile/main.c
grass/trunk/display/d.rast.arrow/main.c
grass/trunk/display/d.rast.num/main.c
grass/trunk/display/d.rast/display.c
grass/trunk/display/d.rast/main.c
grass/trunk/display/d.rgb/main.c
grass/trunk/display/d.rhumbline/main.c
grass/trunk/display/d.rhumbline/plot.c
grass/trunk/display/d.text/main.c
grass/trunk/display/d.thematic.area/area.c
grass/trunk/display/d.thematic.area/main.c
grass/trunk/display/d.thematic.area/plot1.c
grass/trunk/display/d.title/main.c
grass/trunk/display/d.vect.chart/bar.c
grass/trunk/display/d.vect.chart/main.c
grass/trunk/display/d.vect.chart/pie.c
grass/trunk/display/d.vect.chart/plot.c
grass/trunk/display/d.vect/area.c
grass/trunk/display/d.vect/attr.c
grass/trunk/display/d.vect/dir.c
grass/trunk/display/d.vect/label.c
grass/trunk/display/d.vect/main.c
grass/trunk/display/d.vect/plot1.c
grass/trunk/display/d.vect/topo.c
grass/trunk/display/d.vect/utils.c
grass/trunk/display/d.vect/zcoor.c
grass/trunk/display/d.what.rast/main.c
grass/trunk/display/d.what.rast/what.c
grass/trunk/display/d.what.vect/main.c
grass/trunk/display/d.what.vect/what.c
grass/trunk/display/d.where/main.c
grass/trunk/display/d.zoom/box.c
grass/trunk/display/d.zoom/center.c
grass/trunk/display/d.zoom/main.c
grass/trunk/display/d.zoom/pan.c
grass/trunk/display/d.zoom/print.c
grass/trunk/display/d.zoom/quit.c
grass/trunk/display/d.zoom/redraw.c
grass/trunk/display/d.zoom/set.c
grass/trunk/display/d.zoom/zoom.c
grass/trunk/imagery/i.class/add_point.c
grass/trunk/imagery/i.class/del_point.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/draw_reg.c
grass/trunk/imagery/i.class/graphics.c
grass/trunk/imagery/i.class/histograms.c
grass/trunk/imagery/i.class/input.c
grass/trunk/imagery/i.class/main.c
grass/trunk/imagery/i.class/mouse.c
grass/trunk/imagery/i.class/redisplay.c
grass/trunk/imagery/i.class/title.c
grass/trunk/imagery/i.class/view.c
grass/trunk/imagery/i.class/zoom_box.c
grass/trunk/imagery/i.points/analyze.c
grass/trunk/imagery/i.points/ask.c
grass/trunk/imagery/i.points/ask_mag.c
grass/trunk/imagery/i.points/call.c
grass/trunk/imagery/i.points/debug.c
grass/trunk/imagery/i.points/dot.c
grass/trunk/imagery/i.points/drawcell.c
grass/trunk/imagery/i.points/graphics.c
grass/trunk/imagery/i.points/input.c
grass/trunk/imagery/i.points/main.c
grass/trunk/imagery/i.points/mark.c
grass/trunk/imagery/i.points/mouse.c
grass/trunk/imagery/i.points/points.c
grass/trunk/imagery/i.points/title.c
grass/trunk/imagery/i.points/view.c
grass/trunk/imagery/i.points/zoom_box.c
grass/trunk/imagery/i.points/zoom_pnt.c
grass/trunk/imagery/i.vpoints/analyze.c
grass/trunk/imagery/i.vpoints/ask.c
grass/trunk/imagery/i.vpoints/ask_mag.c
grass/trunk/imagery/i.vpoints/call.c
grass/trunk/imagery/i.vpoints/debug.c
grass/trunk/imagery/i.vpoints/dot.c
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.vpoints/drawvect.c
grass/trunk/imagery/i.vpoints/graphics.c
grass/trunk/imagery/i.vpoints/input.c
grass/trunk/imagery/i.vpoints/main.c
grass/trunk/imagery/i.vpoints/mark.c
grass/trunk/imagery/i.vpoints/mouse.c
grass/trunk/imagery/i.vpoints/points.c
grass/trunk/imagery/i.vpoints/setup.c
grass/trunk/imagery/i.vpoints/title.c
grass/trunk/imagery/i.vpoints/view.c
grass/trunk/imagery/i.vpoints/zoom_box.c
grass/trunk/imagery/i.vpoints/zoom_pnt.c
grass/trunk/lib/display/clip.c
grass/trunk/lib/display/draw2.c
grass/trunk/lib/display/r_raster.c
grass/trunk/lib/display/raster.c
grass/trunk/lib/display/raster2.c
grass/trunk/lib/display/setup.c
grass/trunk/lib/display/tran_colr.c
grass/trunk/lib/display/window.c
grass/trunk/raster/r.digit/bnw_line.c
grass/trunk/raster/r.digit/get_area.c
grass/trunk/raster/r.digit/get_circle.c
grass/trunk/raster/r.digit/get_label.c
grass/trunk/raster/r.digit/get_line.c
grass/trunk/raster/r.digit/get_point.c
grass/trunk/raster/r.digit/main.c
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.le/r.le.setup/main.c
grass/trunk/raster/r.le/r.le.setup/mv_wind.c
grass/trunk/raster/r.le/r.le.setup/sample.c
grass/trunk/raster/r.le/r.le.setup/setup.c
grass/trunk/raster/r.le/r.le.trace/main.c
grass/trunk/raster/r.spread/display.c
grass/trunk/vector/v.label/main.c
grass/trunk/vector/v.what/main.c
grass/trunk/vector/v.what/what.c
Log:
raster.h renamed to display_raster.h
Modified: grass/trunk/display/d.barscale/draw_scale.c
===================================================================
--- grass/trunk/display/d.barscale/draw_scale.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.barscale/draw_scale.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -6,7 +6,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "options.h"
#define NUMSCALES 16
Modified: grass/trunk/display/d.barscale/main.c
===================================================================
--- grass/trunk/display/d.barscale/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.barscale/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -26,7 +26,7 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "options.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.colors/get_info.c
===================================================================
--- grass/trunk/display/d.colors/get_info.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.colors/get_info.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include "colors.h"
Modified: grass/trunk/display/d.colors/interact.c
===================================================================
--- grass/trunk/display/d.colors/interact.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.colors/interact.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <unistd.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "graphics.h"
#include "colors.h"
Modified: grass/trunk/display/d.colors/main.c
===================================================================
--- grass/trunk/display/d.colors/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.colors/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "colors.h"
int main(int argc, char **argv)
Modified: grass/trunk/display/d.colortable/main.c
===================================================================
--- grass/trunk/display/d.colortable/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.colortable/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <math.h>
#include <grass/display.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
int main(int argc, char **argv)
Modified: grass/trunk/display/d.erase/main.c
===================================================================
--- grass/trunk/display/d.erase/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.erase/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
int main(int argc, char *argv[])
Modified: grass/trunk/display/d.extract/extract.c
===================================================================
--- grass/trunk/display/d.extract/extract.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.extract/extract.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -4,7 +4,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/Vect.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.extract/main.c
===================================================================
--- grass/trunk/display/d.extract/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.extract/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/Vect.h>
#include <grass/dbmi.h>
Modified: grass/trunk/display/d.font/main.c
===================================================================
--- grass/trunk/display/d.font/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.font/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <errno.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
static char **fonts;
Modified: grass/trunk/display/d.fontlist/main.c
===================================================================
--- grass/trunk/display/d.fontlist/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.fontlist/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
int main(int argc, char **argv)
Modified: grass/trunk/display/d.geodesic/main.c
===================================================================
--- grass/trunk/display/d.geodesic/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.geodesic/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -22,7 +22,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.geodesic/plot.c
===================================================================
--- grass/trunk/display/d.geodesic/plot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.geodesic/plot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <string.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/gis.h>
#include <stdio.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.graph/do_graph.c
===================================================================
--- grass/trunk/display/d.graph/do_graph.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.graph/do_graph.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/symbol.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.graph/main.c
===================================================================
--- grass/trunk/display/d.graph/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.graph/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "options.h"
Modified: grass/trunk/display/d.grid/main.c
===================================================================
--- grass/trunk/display/d.grid/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.grid/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -22,7 +22,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.grid/plot.c
===================================================================
--- grass/trunk/display/d.grid/plot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.grid/plot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.his/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "his.h"
Modified: grass/trunk/display/d.histogram/bar.c
===================================================================
--- grass/trunk/display/d.histogram/bar.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.histogram/bar.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -28,7 +28,7 @@
#include <string.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "bar.h"
int bar(struct stat_list *dist_stats, /* list of distribution statistics */
Modified: grass/trunk/display/d.histogram/draw_slice.c
===================================================================
--- grass/trunk/display/d.histogram/draw_slice.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.histogram/draw_slice.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <math.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/gis.h>
Modified: grass/trunk/display/d.histogram/main.c
===================================================================
--- grass/trunk/display/d.histogram/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.histogram/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -35,7 +35,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "options.h"
Modified: grass/trunk/display/d.histogram/pie.c
===================================================================
--- grass/trunk/display/d.histogram/pie.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.histogram/pie.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -30,7 +30,7 @@
#include <string.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "pie.h"
/*#define DEBUG */
Modified: grass/trunk/display/d.info/main.c
===================================================================
--- grass/trunk/display/d.info/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.info/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.labels/do_labels.c
===================================================================
--- grass/trunk/display/d.labels/do_labels.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.labels/do_labels.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -4,7 +4,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.labels/main.c
===================================================================
--- grass/trunk/display/d.labels/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.labels/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.legend/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -29,7 +29,7 @@
#include <string.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.linegraph/main.c
===================================================================
--- grass/trunk/display/d.linegraph/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.linegraph/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.measure/draw_line.c
===================================================================
--- grass/trunk/display/d.measure/draw_line.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.measure/draw_line.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <stdlib.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
int
Modified: grass/trunk/display/d.measure/main.c
===================================================================
--- grass/trunk/display/d.measure/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.measure/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.measure/msurements.c
===================================================================
--- grass/trunk/display/d.measure/msurements.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.measure/msurements.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.nviz/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -25,7 +25,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.path/main.c
===================================================================
--- grass/trunk/display/d.path/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.path/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
Modified: grass/trunk/display/d.path/select.c
===================================================================
--- grass/trunk/display/d.path/select.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.path/select.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.profile/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rast/display.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "mask.h"
#include "local_proto.h"
Modified: grass/trunk/display/d.rast/main.c
===================================================================
--- grass/trunk/display/d.rast/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rast/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
*****************************************************************************/
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "mask.h"
#include "local_proto.h"
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -38,7 +38,7 @@
#include <string.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -38,7 +38,7 @@
#include <string.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rgb/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -22,7 +22,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
struct band
Modified: grass/trunk/display/d.rhumbline/main.c
===================================================================
--- grass/trunk/display/d.rhumbline/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rhumbline/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.rhumbline/plot.c
===================================================================
--- grass/trunk/display/d.rhumbline/plot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.rhumbline/plot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
void plot(double lon1, double lat1, double lon2, double lat2,
Modified: grass/trunk/display/d.text/main.c
===================================================================
--- grass/trunk/display/d.text/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.text/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -58,7 +58,7 @@
#include <unistd.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.thematic.area/area.c
===================================================================
--- grass/trunk/display/d.thematic.area/area.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.thematic.area/area.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -6,7 +6,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.thematic.area/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -19,7 +19,7 @@
#include <dirent.h>
#include <grass/config.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
Modified: grass/trunk/display/d.thematic.area/plot1.c
===================================================================
--- grass/trunk/display/d.thematic.area/plot1.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.thematic.area/plot1.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -4,7 +4,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "plot.h"
#include "local_proto.h"
#include <grass/symbol.h>
Modified: grass/trunk/display/d.title/main.c
===================================================================
--- grass/trunk/display/d.title/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.title/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/gis.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.vect/area.c
===================================================================
--- grass/trunk/display/d.vect/area.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/area.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -6,7 +6,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.vect/attr.c
===================================================================
--- grass/trunk/display/d.vect/attr.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/attr.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.vect/dir.c
===================================================================
--- grass/trunk/display/d.vect/dir.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/dir.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "plot.h"
Modified: grass/trunk/display/d.vect/label.c
===================================================================
--- grass/trunk/display/d.vect/label.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/label.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <dirent.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
Modified: grass/trunk/display/d.vect/plot1.c
===================================================================
--- grass/trunk/display/d.vect/plot1.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/plot1.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -4,7 +4,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "plot.h"
#include "local_proto.h"
#include <grass/symbol.h>
Modified: grass/trunk/display/d.vect/topo.c
===================================================================
--- grass/trunk/display/d.vect/topo.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/topo.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
Modified: grass/trunk/display/d.vect/utils.c
===================================================================
--- grass/trunk/display/d.vect/utils.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/utils.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
Modified: grass/trunk/display/d.vect/zcoor.c
===================================================================
--- grass/trunk/display/d.vect/zcoor.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect/zcoor.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include "plot.h"
Modified: grass/trunk/display/d.vect.chart/bar.c
===================================================================
--- grass/trunk/display/d.vect.chart/bar.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect.chart/bar.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/symbol.h>
#include "global.h"
Modified: grass/trunk/display/d.vect.chart/main.c
===================================================================
--- grass/trunk/display/d.vect.chart/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect.chart/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
Modified: grass/trunk/display/d.vect.chart/pie.c
===================================================================
--- grass/trunk/display/d.vect.chart/pie.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect.chart/pie.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/symbol.h>
#include "global.h"
Modified: grass/trunk/display/d.vect.chart/plot.c
===================================================================
--- grass/trunk/display/d.vect.chart/plot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.vect.chart/plot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/symbol.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.what.rast/main.c
===================================================================
--- grass/trunk/display/d.what.rast/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.what.rast/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <string.h>
#include "what.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.what.rast/what.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "what.h"
Modified: grass/trunk/display/d.what.vect/main.c
===================================================================
--- grass/trunk/display/d.what.vect/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.what.vect/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -30,7 +30,7 @@
#include <grass/gis.h>
#include <grass/display.h>
#include <grass/Vect.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "what.h"
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.what.vect/what.c
===================================================================
--- grass/trunk/display/d.what.vect/what.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.what.vect/what.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
Modified: grass/trunk/display/d.where/main.c
===================================================================
--- grass/trunk/display/d.where/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.where/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <grass/gis.h>
#include <grass/gprojects.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.zoom/box.c
===================================================================
--- grass/trunk/display/d.zoom/box.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/box.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
int make_window_box(struct Cell_head *window, double magnify, int full,
Modified: grass/trunk/display/d.zoom/center.c
===================================================================
--- grass/trunk/display/d.zoom/center.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/center.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/main.c
===================================================================
--- grass/trunk/display/d.zoom/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/Vect.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/pan.c
===================================================================
--- grass/trunk/display/d.zoom/pan.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/pan.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.zoom/print.c
===================================================================
--- grass/trunk/display/d.zoom/print.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/print.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
static int max(int a, int b)
Modified: grass/trunk/display/d.zoom/quit.c
===================================================================
--- grass/trunk/display/d.zoom/quit.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/quit.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.zoom/redraw.c
===================================================================
--- grass/trunk/display/d.zoom/redraw.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/redraw.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <stdlib.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/set.c
===================================================================
--- grass/trunk/display/d.zoom/set.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/set.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
static double round_to(double in, int sd)
Modified: grass/trunk/display/d.zoom/zoom.c
===================================================================
--- grass/trunk/display/d.zoom/zoom.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/display/d.zoom/zoom.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/imagery/i.class/add_point.c
===================================================================
--- grass/trunk/imagery/i.class/add_point.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/add_point.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -6,7 +6,7 @@
*************************************************************/
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/imagery/i.class/del_point.c
===================================================================
--- grass/trunk/imagery/i.class/del_point.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/del_point.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/gis.h>
#include "globals.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
int draw_cell(View * view, int overlay)
Modified: grass/trunk/imagery/i.class/draw_reg.c
===================================================================
--- grass/trunk/imagery/i.class/draw_reg.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/draw_reg.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/graphics.c
===================================================================
--- grass/trunk/imagery/i.class/graphics.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/graphics.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
static View *makeview(double bottom, double top, double left, double right)
Modified: grass/trunk/imagery/i.class/histograms.c
===================================================================
--- grass/trunk/imagery/i.class/histograms.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/histograms.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <math.h>
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#define MU 'l' /* these are the characters that are printed as */
Modified: grass/trunk/imagery/i.class/input.c
===================================================================
--- grass/trunk/imagery/i.class/input.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/input.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
static int active = 0;
Modified: grass/trunk/imagery/i.class/main.c
===================================================================
--- grass/trunk/imagery/i.class/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/mouse.c
===================================================================
--- grass/trunk/imagery/i.class/mouse.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/mouse.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.class/redisplay.c
===================================================================
--- grass/trunk/imagery/i.class/redisplay.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/redisplay.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/title.c
===================================================================
--- grass/trunk/imagery/i.class/title.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/title.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/view.c
===================================================================
--- grass/trunk/imagery/i.class/view.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/view.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.class/zoom_box.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.class/zoom_box.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,4 +1,4 @@
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/analyze.c
===================================================================
--- grass/trunk/imagery/i.points/analyze.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/analyze.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <math.h>
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/ask.c
===================================================================
--- grass/trunk/imagery/i.points/ask.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/ask.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include <string.h>
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#include "local_proto.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.points/ask_mag.c
===================================================================
--- grass/trunk/imagery/i.points/ask_mag.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/ask_mag.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
struct box
{
Modified: grass/trunk/imagery/i.points/call.c
===================================================================
--- grass/trunk/imagery/i.points/call.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/call.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -8,7 +8,7 @@
#endif
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
/*
* call a subroutine, but as a child process
* allowing interrupts for the child
Modified: grass/trunk/imagery/i.points/debug.c
===================================================================
--- grass/trunk/imagery/i.points/debug.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/debug.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int debug(char *msg)
{
R_stabilize();
Modified: grass/trunk/imagery/i.points/dot.c
===================================================================
--- grass/trunk/imagery/i.points/dot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/dot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int dot(int x, int y)
{
double vx[5], vy[5];
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <grass/gis.h>
#include "globals.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
int drawcell(View * view)
Modified: grass/trunk/imagery/i.points/graphics.c
===================================================================
--- grass/trunk/imagery/i.points/graphics.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/graphics.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,7 +1,7 @@
#include "globals.h"
#include "local_proto.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static View *makeview(double bottom, double top, double left, double right)
{
Modified: grass/trunk/imagery/i.points/input.c
===================================================================
--- grass/trunk/imagery/i.points/input.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/input.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int active = 0;
static int replot;
Modified: grass/trunk/imagery/i.points/main.c
===================================================================
--- grass/trunk/imagery/i.points/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.points/mark.c
===================================================================
--- grass/trunk/imagery/i.points/mark.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/mark.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int get_point2(double *, double *);
static int keyboard(void);
Modified: grass/trunk/imagery/i.points/mouse.c
===================================================================
--- grass/trunk/imagery/i.points/mouse.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/mouse.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.points/points.c
===================================================================
--- grass/trunk/imagery/i.points/points.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/points.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int display_points(int in_color)
{
Modified: grass/trunk/imagery/i.points/title.c
===================================================================
--- grass/trunk/imagery/i.points/title.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/title.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int display_title(View * view)
{
Modified: grass/trunk/imagery/i.points/view.c
===================================================================
--- grass/trunk/imagery/i.points/view.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/view.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.points/zoom_box.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/zoom_box.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int zoom1(int, int);
static int zoom2(int, int);
Modified: grass/trunk/imagery/i.points/zoom_pnt.c
===================================================================
--- grass/trunk/imagery/i.points/zoom_pnt.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.points/zoom_pnt.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int zoom1(int, int);
static int cancel(void);
Modified: grass/trunk/imagery/i.vpoints/analyze.c
===================================================================
--- grass/trunk/imagery/i.vpoints/analyze.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/analyze.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <math.h>
#include <grass/gis.h>
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "crs.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.vpoints/ask.c
===================================================================
--- grass/trunk/imagery/i.vpoints/ask.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/ask.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.vpoints/ask_mag.c
===================================================================
--- grass/trunk/imagery/i.vpoints/ask_mag.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/ask_mag.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
struct box
{
Modified: grass/trunk/imagery/i.vpoints/call.c
===================================================================
--- grass/trunk/imagery/i.vpoints/call.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/call.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -8,7 +8,7 @@
#include <sys/wait.h>
#endif
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "globals.h"
/*
* call a subroutine, but as a child process
Modified: grass/trunk/imagery/i.vpoints/debug.c
===================================================================
--- grass/trunk/imagery/i.vpoints/debug.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/debug.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int debug(char *msg, ...)
{
Modified: grass/trunk/imagery/i.vpoints/dot.c
===================================================================
--- grass/trunk/imagery/i.vpoints/dot.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/dot.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int dot(int x, int y)
{
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <stdlib.h>
Modified: grass/trunk/imagery/i.vpoints/drawvect.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawvect.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/drawvect.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "vectpoints.h"
#include <grass/Vect.h>
Modified: grass/trunk/imagery/i.vpoints/graphics.c
===================================================================
--- grass/trunk/imagery/i.vpoints/graphics.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/graphics.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static View *makeview(double bottom, double top, double left, double right)
{
Modified: grass/trunk/imagery/i.vpoints/input.c
===================================================================
--- grass/trunk/imagery/i.vpoints/input.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/input.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int active = 0;
static int replot;
Modified: grass/trunk/imagery/i.vpoints/main.c
===================================================================
--- grass/trunk/imagery/i.vpoints/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -28,7 +28,7 @@
#include <string.h>
#include <signal.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.vpoints/mark.c
===================================================================
--- grass/trunk/imagery/i.vpoints/mark.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/mark.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int get_point2(double *, double *);
static int keyboard(void);
Modified: grass/trunk/imagery/i.vpoints/mouse.c
===================================================================
--- grass/trunk/imagery/i.vpoints/mouse.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/mouse.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.vpoints/points.c
===================================================================
--- grass/trunk/imagery/i.vpoints/points.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/points.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
/* overlay ground control points on the display */
Modified: grass/trunk/imagery/i.vpoints/setup.c
===================================================================
--- grass/trunk/imagery/i.vpoints/setup.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/setup.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.vpoints/title.c
===================================================================
--- grass/trunk/imagery/i.vpoints/title.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/title.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int display_title(View * view)
{
Modified: grass/trunk/imagery/i.vpoints/view.c
===================================================================
--- grass/trunk/imagery/i.vpoints/view.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/view.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include "globals.h"
#include <string.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int Configure_view(View * view, char *name, char *mapset, double ns_res, double ew_res /* original map resolution */
)
Modified: grass/trunk/imagery/i.vpoints/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.vpoints/zoom_box.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/zoom_box.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static int x1, y1, x2, y2;
static View *pick_view, *zoom_view, *main_view;
Modified: grass/trunk/imagery/i.vpoints/zoom_pnt.c
===================================================================
--- grass/trunk/imagery/i.vpoints/zoom_pnt.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/imagery/i.vpoints/zoom_pnt.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,6 +1,6 @@
#include <math.h>
#include "globals.h"
-#include <grass/raster.h>
+#include <grass/display_raster.h>
static View *pick_view, *zoom_view, *main_view;
static int target_flag;
Copied: grass/trunk/include/display_raster.h (from rev 37989, grass/trunk/include/raster.h)
===================================================================
--- grass/trunk/include/display_raster.h (rev 0)
+++ grass/trunk/include/display_raster.h 2009-06-20 08:33:35 UTC (rev 37990)
@@ -0,0 +1,45 @@
+#ifndef _GRASS_RASTER_H
+#define _GRASS_RASTER_H
+
+int R_open_driver(void);
+void R_close_driver(void);
+
+void R_set_window(double, double, double, double);
+void R_get_window(double *, double *, double *, double *);
+
+void R_standard_color(int);
+void R_RGB_color(int, int, int);
+
+void R_line_width(double);
+void R_erase(void);
+
+void R_pos_abs(double, double);
+void R_box_abs(double, double, double, double);
+
+void R_begin(void);
+void R_move(double, double);
+void R_cont(double, double);
+void R_close(void);
+void R_stroke(void);
+void R_fill(void);
+void R_point(double, double);
+
+void R_text_size(double, double);
+void R_text_rotation(double);
+void R_text(const char *);
+void R_get_text_box(const char *, double *, double *, double *, double *);
+
+void R_font(const char *);
+void R_encoding(const char *);
+void R_font_list(char ***, int *);
+void R_font_info(char ***, int *);
+
+void R_begin_scaled_raster(int, int[2][2], double[2][2]);
+int R_scaled_raster(int, int,
+ const unsigned char *,
+ const unsigned char *,
+ const unsigned char *, const unsigned char *);
+void R_end_scaled_raster(void);
+void R_bitmap(int, int, int, const unsigned char *);
+
+#endif
Deleted: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/include/raster.h 2009-06-20 08:33:35 UTC (rev 37990)
@@ -1,45 +0,0 @@
-#ifndef _GRASS_RASTER_H
-#define _GRASS_RASTER_H
-
-int R_open_driver(void);
-void R_close_driver(void);
-
-void R_set_window(double, double, double, double);
-void R_get_window(double *, double *, double *, double *);
-
-void R_standard_color(int);
-void R_RGB_color(int, int, int);
-
-void R_line_width(double);
-void R_erase(void);
-
-void R_pos_abs(double, double);
-void R_box_abs(double, double, double, double);
-
-void R_begin(void);
-void R_move(double, double);
-void R_cont(double, double);
-void R_close(void);
-void R_stroke(void);
-void R_fill(void);
-void R_point(double, double);
-
-void R_text_size(double, double);
-void R_text_rotation(double);
-void R_text(const char *);
-void R_get_text_box(const char *, double *, double *, double *, double *);
-
-void R_font(const char *);
-void R_encoding(const char *);
-void R_font_list(char ***, int *);
-void R_font_info(char ***, int *);
-
-void R_begin_scaled_raster(int, int[2][2], double[2][2]);
-int R_scaled_raster(int, int,
- const unsigned char *,
- const unsigned char *,
- const unsigned char *, const unsigned char *);
-void R_end_scaled_raster(void);
-void R_bitmap(int, int, int, const unsigned char *);
-
-#endif
Modified: grass/trunk/lib/display/clip.c
===================================================================
--- grass/trunk/lib/display/clip.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/clip.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "path.h"
Modified: grass/trunk/lib/display/draw2.c
===================================================================
--- grass/trunk/lib/display/draw2.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/draw2.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -3,7 +3,7 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "path.h"
Modified: grass/trunk/lib/display/r_raster.c
===================================================================
--- grass/trunk/lib/display/r_raster.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/r_raster.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -10,7 +10,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "driver.h"
Modified: grass/trunk/lib/display/raster.c
===================================================================
--- grass/trunk/lib/display/raster.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/raster.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
extern int D__overlay_mode;
Modified: grass/trunk/lib/display/raster2.c
===================================================================
--- grass/trunk/lib/display/raster2.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/raster2.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int D__overlay_mode = 0; /* external for now, but to be fixed later */
Modified: grass/trunk/lib/display/setup.c
===================================================================
--- grass/trunk/lib/display/setup.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/setup.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -12,7 +12,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
/*!
Modified: grass/trunk/lib/display/tran_colr.c
===================================================================
--- grass/trunk/lib/display/tran_colr.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/tran_colr.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -5,7 +5,7 @@
#include <string.h>
#include <grass/display.h>
#include <grass/colors.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
static struct color_rgb *colors;
Modified: grass/trunk/lib/display/window.c
===================================================================
--- grass/trunk/lib/display/window.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/lib/display/window.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -7,7 +7,7 @@
#include <grass/colors.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
void D_erase(const char *color)
{
Modified: grass/trunk/raster/r.digit/bnw_line.c
===================================================================
--- grass/trunk/raster/r.digit/bnw_line.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/bnw_line.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
int
Modified: grass/trunk/raster/r.digit/get_area.c
===================================================================
--- grass/trunk/raster/r.digit/get_area.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/get_area.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_circle.c
===================================================================
--- grass/trunk/raster/r.digit/get_circle.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/get_circle.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -19,7 +19,7 @@
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_label.c
===================================================================
--- grass/trunk/raster/r.digit/get_label.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/get_label.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.digit/get_line.c
===================================================================
--- grass/trunk/raster/r.digit/get_line.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/get_line.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_point.c
===================================================================
--- grass/trunk/raster/r.digit/get_point.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/get_point.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <stdio.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/main.c
===================================================================
--- grass/trunk/raster/r.digit/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.digit/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -21,7 +21,7 @@
#include <string.h>
#include <unistd.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.his/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -18,7 +18,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "his.h"
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.le/r.le.setup/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.le/r.le.setup/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -28,7 +28,7 @@
#include <grass/config.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "setup.h"
Modified: grass/trunk/raster/r.le/r.le.setup/mv_wind.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -20,7 +20,7 @@
* *
************************************************************/
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "setup.h"
#include <grass/config.h>
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/config.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "setup.h"
Modified: grass/trunk/raster/r.le/r.le.setup/setup.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/setup.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.le/r.le.setup/setup.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include "setup.h"
#include <grass/config.h>
Modified: grass/trunk/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <grass/config.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.spread/display.c
===================================================================
--- grass/trunk/raster/r.spread/display.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/raster/r.spread/display.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -4,7 +4,7 @@
#include <time.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include "cmd_line.h"
#include "local_proto.h"
Modified: grass/trunk/vector/v.label/main.c
===================================================================
--- grass/trunk/vector/v.label/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/vector/v.label/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -16,7 +16,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/vector/v.what/main.c
===================================================================
--- grass/trunk/vector/v.what/main.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/vector/v.what/main.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -23,7 +23,7 @@
#include <grass/glocale.h>
#include <grass/gis.h>
#include <grass/Vect.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/vector/v.what/what.c
===================================================================
--- grass/trunk/vector/v.what/what.c 2009-06-20 04:38:38 UTC (rev 37989)
+++ grass/trunk/vector/v.what/what.c 2009-06-20 08:33:35 UTC (rev 37990)
@@ -2,7 +2,7 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/raster.h>
+#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
More information about the grass-commit
mailing list