[GRASS-SVN] r62003 - grass/trunk/include

[svn_grass at osgeo.org]

Author: mmetz
Date: 2014-09-16 13:05:46 -0700 (Tue, 16 Sep 2014)
New Revision: 62003

Modified:
   grass/trunk/include/display.h
   grass/trunk/include/raster.h
Log:
move RGBA_Color to display.h

Modified: grass/trunk/include/display.h
===================================================================
--- grass/trunk/include/display.h	2014-09-16 20:05:31 UTC (rev 62002)
+++ grass/trunk/include/display.h	2014-09-16 20:05:46 UTC (rev 62003)
@@ -5,6 +5,18 @@
 #include <grass/raster.h>
 #include <grass/symbol.h>
 
+struct color_rgba
+{
+    unsigned char r, g, b, a;	/* red, green, blue, and alpha */
+};
+
+typedef struct color_rgba RGBA_Color;
+
+/* RGBA color alpha presets */
+#define RGBA_COLOR_OPAQUE     255
+#define RGBA_COLOR_TRANSPARENT  0
+#define RGBA_COLOR_NONE         0
+
 enum clip_mode
 {
     M_NONE,

Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h	2014-09-16 20:05:31 UTC (rev 62002)
+++ grass/trunk/include/raster.h	2014-09-16 20:05:46 UTC (rev 62003)
@@ -241,18 +241,6 @@
 
 struct GDAL_link;
 
-typedef struct
-{
-    unsigned char r, g, b, a;	/* red, green, blue, and alpha */
-} RGBA_Color;
-
-typedef RGBA_Color RGB_Color;
-
-/* RGBA_Color alpha presets */
-#define RGBA_COLOR_OPAQUE     255
-#define RGBA_COLOR_TRANSPARENT  0
-#define RGBA_COLOR_NONE         0
-
 /*** prototypes ***/
 #include <grass/defs/raster.h>