Bladeren bron

add G_str_to_color to colors.h
include grass/colors.h where is missing


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38132 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 16 jaren geleden
bovenliggende
commit
b85a294098

+ 1 - 0
display/d.graph/do_graph.c

@@ -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>

+ 1 - 0
display/d.graph/main.c

@@ -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>

+ 1 - 0
display/d.labels/color.c

@@ -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>

+ 1 - 0
display/d.rast/display.c

@@ -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>

+ 3 - 2
include/colors.h

@@ -42,8 +42,9 @@ struct color_name
 };
 
 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

+ 1 - 0
lib/nviz/nviz.c

@@ -16,6 +16,7 @@
    \date 2008
  */
 
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/nviz.h>

+ 1 - 0
lib/raster/color_hist.c

@@ -15,6 +15,7 @@
 
 #include <grass/gis.h>
 #include <grass/raster.h>
+#include <grass/colors.h>
 
 /*!
  * \brief Make histogram-stretched grey colors

+ 1 - 0
ps/ps.map/do_labels.c

@@ -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"

+ 1 - 0
ps/ps.map/main.c

@@ -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>
 

+ 1 - 0
ps/ps.map/ps_vareas.c

@@ -5,6 +5,7 @@
  */
 
 #include <grass/gis.h>
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/vector.h>

+ 1 - 0
ps/ps.map/ps_vlines.c

@@ -6,6 +6,7 @@
  */
 
 #include <grass/gis.h>
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/vector.h>

+ 1 - 0
ps/ps.map/ps_vpoints.c

@@ -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>

+ 1 - 0
ps/ps.map/r_border.c

@@ -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"

+ 1 - 0
ps/ps.map/r_plt.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include "ps_info.h"
 #include "local_proto.h"

+ 1 - 0
ps/ps.map/r_text.c

@@ -6,6 +6,7 @@
  */
 
 #include <string.h>
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include "clr.h"
 #include "labels.h"

+ 1 - 0
ps/ps.map/r_vareas.c

@@ -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>
 

+ 1 - 0
ps/ps.map/r_vlines.c

@@ -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"

+ 1 - 0
ps/ps.map/r_vpoints.c

@@ -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>

+ 3 - 1
ps/ps.map/r_wind.c

@@ -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)

+ 1 - 0
vector/v.to.rast/support.c

@@ -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>