[GRASS-SVN] r38132 - in grass/trunk: display/d.graph
display/d.labels display/d.rast include lib/nviz lib/raster
ps/ps.map vector/v.to.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jun 30 14:50:44 EDT 2009
Author: martinl
Date: 2009-06-30 14:50:43 -0400 (Tue, 30 Jun 2009)
New Revision: 38132
Modified:
grass/trunk/display/d.graph/do_graph.c
grass/trunk/display/d.graph/main.c
grass/trunk/display/d.labels/color.c
grass/trunk/display/d.rast/display.c
grass/trunk/include/colors.h
grass/trunk/lib/nviz/nviz.c
grass/trunk/lib/raster/color_hist.c
grass/trunk/ps/ps.map/do_labels.c
grass/trunk/ps/ps.map/main.c
grass/trunk/ps/ps.map/ps_vareas.c
grass/trunk/ps/ps.map/ps_vlines.c
grass/trunk/ps/ps.map/ps_vpoints.c
grass/trunk/ps/ps.map/r_border.c
grass/trunk/ps/ps.map/r_plt.c
grass/trunk/ps/ps.map/r_text.c
grass/trunk/ps/ps.map/r_vareas.c
grass/trunk/ps/ps.map/r_vlines.c
grass/trunk/ps/ps.map/r_vpoints.c
grass/trunk/ps/ps.map/r_wind.c
grass/trunk/vector/v.to.rast/support.c
Log:
add G_str_to_color to colors.h
include grass/colors.h where is missing
Modified: grass/trunk/display/d.graph/do_graph.c
===================================================================
--- grass/trunk/display/d.graph/do_graph.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/display/d.graph/do_graph.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/display.h>
#include <grass/symbol.h>
Modified: grass/trunk/display/d.graph/main.c
===================================================================
--- grass/trunk/display/d.graph/main.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/display/d.graph/main.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.labels/color.c
===================================================================
--- grass/trunk/display/d.labels/color.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/display/d.labels/color.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -16,6 +16,7 @@
/** ??? move these into libgis ??? (libraster for set_color_from_RGBA()) **/
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/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-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/display/d.rast/display.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/include/colors.h
===================================================================
--- grass/trunk/include/colors.h 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/include/colors.h 2009-06-30 18:50:43 UTC (rev 38132)
@@ -42,8 +42,9 @@
};
extern int G_num_standard_colors(void);
-extern struct color_rgb G_standard_color_rgb(int n);
+extern struct color_rgb G_standard_color_rgb(int);
extern int G_num_standard_color_names(void);
-extern const struct color_name *G_standard_color_name(int n);
+extern const struct color_name *G_standard_color_name(int);
+extern int G_str_to_color(const char *, int *, int *, int *);
#endif
Modified: grass/trunk/lib/nviz/nviz.c
===================================================================
--- grass/trunk/lib/nviz/nviz.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/lib/nviz/nviz.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -16,6 +16,7 @@
\date 2008
*/
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/glocale.h>
#include <grass/nviz.h>
Modified: grass/trunk/lib/raster/color_hist.c
===================================================================
--- grass/trunk/lib/raster/color_hist.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/lib/raster/color_hist.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -15,6 +15,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
+#include <grass/colors.h>
/*!
* \brief Make histogram-stretched grey colors
Modified: grass/trunk/ps/ps.map/do_labels.c
===================================================================
--- grass/trunk/ps/ps.map/do_labels.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/do_labels.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -8,6 +8,7 @@
#include <stdlib.h>
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/glocale.h>
#include "clr.h"
Modified: grass/trunk/ps/ps.map/main.c
===================================================================
--- grass/trunk/ps/ps.map/main.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/main.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -24,6 +24,7 @@
#include <signal.h>
#include <errno.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/ps/ps.map/ps_vareas.c
===================================================================
--- grass/trunk/ps/ps.map/ps_vareas.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/ps_vareas.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -5,6 +5,7 @@
*/
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/glocale.h>
#include <grass/vector.h>
Modified: grass/trunk/ps/ps.map/ps_vlines.c
===================================================================
--- grass/trunk/ps/ps.map/ps_vlines.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/ps_vlines.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -6,6 +6,7 @@
*/
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/glocale.h>
#include <grass/vector.h>
Modified: grass/trunk/ps/ps.map/ps_vpoints.c
===================================================================
--- grass/trunk/ps/ps.map/ps_vpoints.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/ps_vpoints.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -5,6 +5,7 @@
** modified to use G_plot_line() by Olga Waupotitsch on dec,93
*/
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
Modified: grass/trunk/ps/ps.map/r_border.c
===================================================================
--- grass/trunk/ps/ps.map/r_border.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_border.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include "border.h"
#include "ps_info.h"
Modified: grass/trunk/ps/ps.map/r_plt.c
===================================================================
--- grass/trunk/ps/ps.map/r_plt.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_plt.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -1,4 +1,5 @@
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include "ps_info.h"
#include "local_proto.h"
Modified: grass/trunk/ps/ps.map/r_text.c
===================================================================
--- grass/trunk/ps/ps.map/r_text.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_text.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -6,6 +6,7 @@
*/
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include "clr.h"
#include "labels.h"
Modified: grass/trunk/ps/ps.map/r_vareas.c
===================================================================
--- grass/trunk/ps/ps.map/r_vareas.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_vareas.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/vector.h>
Modified: grass/trunk/ps/ps.map/r_vlines.c
===================================================================
--- grass/trunk/ps/ps.map/r_vlines.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_vlines.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -8,6 +8,7 @@
*/
#include <stdlib.h>
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/vector.h>
#include "vector.h"
Modified: grass/trunk/ps/ps.map/r_vpoints.c
===================================================================
--- grass/trunk/ps/ps.map/r_vpoints.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_vpoints.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/ps/ps.map/r_wind.c
===================================================================
--- grass/trunk/ps/ps.map/r_wind.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/ps/ps.map/r_wind.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -1,7 +1,9 @@
/* parse the "region" instruction */
-#include "ps_info.h"
+
#include <string.h>
+#include <grass/colors.h>
#include <grass/raster.h>
+#include "ps_info.h"
#include "local_proto.h"
#define KEY(x) (strcmp(key,x)==0)
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2009-06-30 17:49:50 UTC (rev 38131)
+++ grass/trunk/vector/v.to.rast/support.c 2009-06-30 18:50:43 UTC (rev 38132)
@@ -8,6 +8,7 @@
#include <string.h>
#include <stdio.h>
#include <grass/gis.h>
+#include <grass/colors.h>
#include <grass/raster.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
More information about the grass-commit
mailing list